diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-10-11 23:13:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-11 23:13:40 -0700 |
| commit | 488e1bab2ca384863517375f47be33dca4f170f8 (patch) | |
| tree | 8f02ee0dc9ccca7cbb2e59cf73e90cc5c9aae842 /var | |
| parent | a6f85f51d061fd9e25e5af753136ad08da9830c5 (diff) | |
| download | spack-488e1bab2ca384863517375f47be33dca4f170f8.tar.gz spack-488e1bab2ca384863517375f47be33dca4f170f8.tar.bz2 spack-488e1bab2ca384863517375f47be33dca4f170f8.tar.xz spack-488e1bab2ca384863517375f47be33dca4f170f8.zip | |
Make `insecure` option work with curl AND git. (#1786)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/jdk/package.py | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index bab0920434..518a469435 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -26,10 +26,7 @@ # Author: Justin Too <too1@llnl.gov> # import distutils.dir_util - -import spack from spack import * -import llnl.util.tty as tty class Jdk(Package): @@ -37,11 +34,6 @@ class Jdk(Package): in the form of a binary product aimed at Java developers.""" homepage = "http://www.oracle.com/technetwork/java/javase/downloads/index.html" - version('8u66-linux-x64', '88f31f3d642c3287134297b8c10e61bf', - url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz") - version('8u92-linux-x64', '65a1cc17ea362453a6e0eb4f13be76e4', - url="http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-linux-x64.tar.gz") - # Oracle requires that you accept their License Agreement in order # to access the Java packages in download.oracle.com. In order to # automate this process, we need to utilize these additional curl @@ -53,18 +45,12 @@ class Jdk(Package): '-H', # specify required License Agreement cookie 'Cookie: oraclelicense=accept-securebackup-cookie'] - def do_fetch(self, mirror_only=False): - # Add our custom curl commandline options - tty.msg( - "[Jdk] Adding required commandline options to curl " + - "before performing fetch: %s" % - (self.curl_options)) - - for option in self.curl_options: - spack.curl.add_default_arg(option) - - # Now perform the actual fetch - super(Jdk, self).do_fetch(mirror_only) + version('8u66-linux-x64', '88f31f3d642c3287134297b8c10e61bf', + url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz", + curl_options=curl_options) + version('8u92-linux-x64', '65a1cc17ea362453a6e0eb4f13be76e4', + url="http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-linux-x64.tar.gz", + curl_options=curl_options) def install(self, spec, prefix): distutils.dir_util.copy_tree(".", prefix) |