diff options
| author | Michael Kuhn <michael.kuhn@informatik.uni-hamburg.de> | 2020-03-20 20:11:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 12:11:42 -0700 |
| commit | 545fae84075c0cbd54518da7f03e690e708b2861 (patch) | |
| tree | 123f0adee7fc51d6f3b4419a899046c2cb481c18 | |
| parent | 2f8ff722a9767538d3edddacb2bd8ee6acc9d1a5 (diff) | |
| download | spack-545fae84075c0cbd54518da7f03e690e708b2861.tar.gz spack-545fae84075c0cbd54518da7f03e690e708b2861.tar.bz2 spack-545fae84075c0cbd54518da7f03e690e708b2861.tar.xz spack-545fae84075c0cbd54518da7f03e690e708b2861.zip | |
spack checksum: Use package's fetch_options (#15481)
This makes sure that a package's fetch_options are used when fetching
new versions to checksum. This allows working around problems with
slow servers or those requiring a cookie to be set.
| -rw-r--r-- | lib/spack/spack/cmd/checksum.py | 3 | ||||
| -rw-r--r-- | lib/spack/spack/stage.py | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/spack/spack/cmd/checksum.py b/lib/spack/spack/cmd/checksum.py index 343915868c..eaeaf5337f 100644 --- a/lib/spack/spack/cmd/checksum.py +++ b/lib/spack/spack/cmd/checksum.py @@ -56,7 +56,8 @@ def checksum(parser, args): tty.die("Could not find any versions for {0}".format(pkg.name)) version_lines = spack.stage.get_checksums_for_versions( - url_dict, pkg.name, keep_stage=args.keep_stage) + url_dict, pkg.name, keep_stage=args.keep_stage, + fetch_options=pkg.fetch_options) print() print(version_lines) diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index dd05131391..54d370a50d 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -752,7 +752,8 @@ def purge(): def get_checksums_for_versions( - url_dict, name, first_stage_function=None, keep_stage=False): + url_dict, name, first_stage_function=None, keep_stage=False, + fetch_options=None): """Fetches and checksums archives from URLs. This function is called by both ``spack checksum`` and ``spack @@ -766,6 +767,8 @@ def get_checksums_for_versions( first_stage_function (callable): function that takes a Stage and a URL; this is run on the stage of the first URL downloaded keep_stage (bool): whether to keep staging area when command completes + fetch_options (dict): Options used for the fetcher (such as timeout + or cookies) Returns: (str): A multi-line string containing versions and corresponding hashes @@ -799,7 +802,12 @@ def get_checksums_for_versions( i = 0 for url, version in zip(urls, versions): try: - with Stage(url, keep=keep_stage) as stage: + if fetch_options: + url_or_fs = fs.URLFetchStrategy( + url, fetch_options=fetch_options) + else: + url_or_fs = url + with Stage(url_or_fs, keep=keep_stage) as stage: # Fetch the archive stage.fetch() if i == 0 and first_stage_function: |