diff options
| author | Doug Jacobsen <jacobsen.douglas@gmail.com> | 2022-03-03 17:34:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-03 16:34:33 -0800 |
| commit | 06fd0f892edf5b98dc14a499147c6d628f0c30ef (patch) | |
| tree | 00d1cd5260d7802c060c2b43ed983d17a255425c /lib | |
| parent | b13629062a017bc8b1dd02297c0ba7553936f578 (diff) | |
| download | spack-06fd0f892edf5b98dc14a499147c6d628f0c30ef.tar.gz spack-06fd0f892edf5b98dc14a499147c6d628f0c30ef.tar.bz2 spack-06fd0f892edf5b98dc14a499147c6d628f0c30ef.tar.xz spack-06fd0f892edf5b98dc14a499147c6d628f0c30ef.zip | |
Revert GCS fetch strategy, to remove s3 interface (#28736)
This commit reverts the GCS fetch strategy to before commit:
d7596125231e800ca41c60e379be2b8abb47d20d
The previous commit added some s3 syntax to handle connections, but
added them into the GCS fetch strategy in a way that prevents GCS from
working anymore.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/fetch_strategy.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index f85f04efb2..bb7d446240 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -1437,13 +1437,7 @@ class GCSFetchStrategy(URLFetchStrategy): basename = os.path.basename(parsed_url.path) with working_dir(self.stage.path): - import spack.util.s3 as s3_util - s3 = s3_util.create_s3_session(self.url, - connection=s3_util.get_mirror_connection(parsed_url), url_type="fetch") # noqa: E501 - - headers = s3.get_object(Bucket=parsed_url.netloc, - Key=parsed_url.path.lstrip("/")) - stream = headers["Body"] + _, headers, stream = web_util.read_from_url(self.url) with open(basename, 'wb') as f: shutil.copyfileobj(stream, f) |