summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorOliver Breitwieser <oliver@breitwieser.eu>2019-04-19 23:43:45 +0200
committerPeter Scheibel <scheibel1@llnl.gov>2019-04-19 14:43:45 -0700
commit56c233b0b70320c0d5534d736d2bebc83e379fd3 (patch)
tree6114a7f41d741b0812748e16c714fc907f42bbfc /var
parente86027d1f84af99a6d8c0ed152fd26ac703527e4 (diff)
downloadspack-56c233b0b70320c0d5534d736d2bebc83e379fd3.tar.gz
spack-56c233b0b70320c0d5534d736d2bebc83e379fd3.tar.bz2
spack-56c233b0b70320c0d5534d736d2bebc83e379fd3.tar.xz
spack-56c233b0b70320c0d5534d736d2bebc83e379fd3.zip
jdk package: Fix fetching with curl 7.64.0+ (#11108)
Starting with version 7.64.0, curl skips cookies specified with "-H" (generic custom header specification) when following redirects, which causes the "accept-license"-cookie for jdk to disappear. The result is that jdk fails to download. This uses the "-b" option (which is used specifically for configuring cookies) instead, which is more permissive.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/jdk/package.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py
index e44e2b5950..2c56b9b8a3 100644
--- a/var/spack/repos/builtin/packages/jdk/package.py
+++ b/var/spack/repos/builtin/packages/jdk/package.py
@@ -26,8 +26,8 @@ class Jdk(Package):
# http://stackoverflow.com/questions/10268583/how-to-automate-download-and-installation-of-java-jdk-on-linux
curl_options = [
'-j', # junk cookies
- '-H', # specify required License Agreement cookie
- 'Cookie: oraclelicense=accept-securebackup-cookie'
+ '-b', # specify required License Agreement cookie
+ 'oraclelicense=accept-securebackup-cookie'
]
# To add the latest version, go to the homepage listed above,