diff options
| -rw-r--r-- | lib/spack/spack/fetch_strategy.py | 12 | ||||
| -rw-r--r-- | lib/spack/spack/stage.py | 2 | ||||
| -rw-r--r-- | var/spack/packages/boost/package.py | 5 | ||||
| -rw-r--r-- | var/spack/packages/dyninst/package.py | 2 |
4 files changed, 17 insertions, 4 deletions
diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index d48b999ddc..0e848652ae 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -156,9 +156,10 @@ class URLFetchStrategy(FetchStrategy): if spack.curl.returncode == 22: # This is a 404. Curl will print the error. - raise FailedDownloadError(self.url) + raise FailedDownloadError( + self.url, "URL %s was not found!" % self.url) - if spack.curl.returncode == 60: + elif spack.curl.returncode == 60: # This is a certificate error. Suggest spack -k raise FailedDownloadError( self.url, @@ -168,6 +169,13 @@ class URLFetchStrategy(FetchStrategy): "can try running spack -k, which will not check SSL certificates." "Use this at your own risk.") + else: + # This is some other curl error. Curl will print the + # error, but print a spack message too + raise FailedDownloadError( + self.url, "Curl failed with error %d", spack.curl.returncode) + + # Check if we somehow got an HTML file rather than the archive we # asked for. We only look at the last content type, to handle # redirects properly. diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index f09346ab9b..84454c9d2c 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -260,6 +260,8 @@ class Stage(object): tty.msg("Fetching from %s failed." % fetcher) tty.debug(e) continue + else: + tty.die("All fetchers failed for %s" % self.name) def check(self): diff --git a/var/spack/packages/boost/package.py b/var/spack/packages/boost/package.py index d3231c3baa..254d1afda1 100644 --- a/var/spack/packages/boost/package.py +++ b/var/spack/packages/boost/package.py @@ -53,7 +53,10 @@ class Boost(Package): bootstrap = Executable('./bootstrap.sh') bootstrap() - b2 = Executable('./b2') + # b2 used to be called bjam, before 1.47 (sigh) + b2name = './b2' if spec.satisfies('@1.47:') else './bjam' + + b2 = Executable(b2name) b2('install', '-j %s' % make_jobs, '--prefix=%s' % prefix) diff --git a/var/spack/packages/dyninst/package.py b/var/spack/packages/dyninst/package.py index df19ac7bc0..9fbc6385a9 100644 --- a/var/spack/packages/dyninst/package.py +++ b/var/spack/packages/dyninst/package.py @@ -32,7 +32,7 @@ class Dyninst(Package): list_url = "http://www.dyninst.org/downloads/dyninst-8.x" version('8.1.2', 'bf03b33375afa66fe0efa46ce3f4b17a') - version('8.1.1', '1f8743e3a5662b25ce64a7edf647e77d') + version('8.1.1', 'd1a04e995b7aa70960cd1d1fac8bd6ac') depends_on("libelf") depends_on("libdwarf") |