hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use util.url.join for URLs in GNU Mirrors / reorder Mirrors (#14395)

Browse source 
* Reorder GNU mirrors (#14395)

As @adamjstewart commented in #14395, GNU suggests to use
their mirror. So reorder the mirror to the top.

GNU Doc: https://www.gnu.org/prep/ftp.en.html

* Use spack.util.url.join for URLs in GNU mirrors (#14395)

One should not use os.path.join for URLs. This does only
work on POSIX systems.

Instead use spack.util.url.join.
So every part in spack uses the same url joining method.
This commit is contained in:
Dr. Christian Tacke 2020-01-21 20:14:38 +01:00 committed by Adam J. Stewart
parent 54ecc4e504
commit 5eed196f74
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/spack/spack/build_systems/gnu.py
View file

@ -3,8 +3,7 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
import os.path
import spack.util.url
import spack.package
@ -15,8 +14,8 @@ class GNUMirrorPackage(spack.package.PackageBase):
#: List of GNU mirrors used by Spack
base_mirrors = [
'https://ftp.gnu.org/gnu',
'https://ftpmirror.gnu.org/',
'https://ftp.gnu.org/gnu/',
# Fall back to http if https didn't work (for instance because
# Spack is bootstrapping curl)
'http://ftpmirror.gnu.org/'
@ -26,7 +25,8 @@ class GNUMirrorPackage(spack.package.PackageBase):
def urls(self):
self._ensure_gnu_mirror_path_is_set_or_raise()
return [
os.path.join(m, self.gnu_mirror_path) for m in self.base_mirrors
spack.util.url.join(m, self.gnu_mirror_path, resolve_href=True)
for m in self.base_mirrors
]
def _ensure_gnu_mirror_path_is_set_or_raise(self):