zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fetch of spec.yaml files from buildcache (#19101)

Browse Source 
Since those files currently exist in buildcaches (in S3 buckets) with
potentially different content types, we should be less restrictive in
what content types we accept when attempting to fetch them.  This PR
removes the content type constraint so any file with the matching
name will be found.
This commit is contained in:
Scott Wittenburg 2020-10-01 14:32:43 -06:00 committed by GitHub
parent a2795519df
commit d3d98075c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/spack/spack/binary_distribution.py
View File

@ -271,8 +271,7 @@ def fetch_and_cache_index(self, mirror_url, expect_hash=None):
# Fetch the hash first so we can check if we actually need to fetch
# the index itself.
try:
_, _, fs = web_util.read_from_url(
hash_fetch_url, 'text/plain')
_, _, fs = web_util.read_from_url(hash_fetch_url)
fetched_hash = codecs.getreader('utf-8')(fs).read()
except (URLError, web_util.SpackWebError) as url_err:
tty.debug('Unable to read index hash {0}'.format(
@ -288,8 +287,7 @@ def fetch_and_cache_index(self, mirror_url, expect_hash=None):
# Fetch index itself
try:
_, _, fs = web_util.read_from_url(
index_fetch_url, 'application/json')
_, _, fs = web_util.read_from_url(index_fetch_url)
index_object_str = codecs.getreader('utf-8')(fs).read()
except (URLError, web_util.SpackWebError) as url_err:
tty.debug('Unable to read index {0}'.format(index_fetch_url),
@ -1162,8 +1160,7 @@ def try_direct_fetch(spec, force=False, full_hash_match=False):
mirror.fetch_url, _build_cache_relative_path, specfile_name)
try:
_, _, fs = web_util.read_from_url(
buildcache_fetch_url, 'text/plain')
_, _, fs = web_util.read_from_url(buildcache_fetch_url)
fetched_spec_yaml = codecs.getreader('utf-8')(fs).read()
except (URLError, web_util.SpackWebError, HTTPError) as url_err:
tty.debug('Did not find {0} on {1}'.format(