diff options
author | alalazo <massimiliano.culpo@googlemail.com> | 2016-01-26 14:11:23 +0100 |
---|---|---|
committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-01-26 14:11:23 +0100 |
commit | 5e3b7a424765ee64f71192bdca129c104a1246f6 (patch) | |
tree | 4ddc3ae8ae5ba37f1f9a4710dd5e3d3bf3dc38ed /lib | |
parent | 093b8317998c395ed3e2dee7f19d1bdcea1b0560 (diff) | |
download | spack-5e3b7a424765ee64f71192bdca129c104a1246f6.tar.gz spack-5e3b7a424765ee64f71192bdca129c104a1246f6.tar.bz2 spack-5e3b7a424765ee64f71192bdca129c104a1246f6.tar.xz spack-5e3b7a424765ee64f71192bdca129c104a1246f6.zip |
Fixes issues introduced after merge with conflicts
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/spack/package.py | 2 | ||||
-rw-r--r-- | lib/spack/spack/stage.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 14cbc0dbce..a1b8d12ec2 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -702,7 +702,7 @@ class Package(object): if not self.spec.concrete: raise ValueError("Can only stage concrete packages.") - self.do_fetch() + self.do_fetch(mirror_only) self.stage.expand_archive() self.stage.chdir_to_source() diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index 6ba301d95f..f217450d42 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -1,4 +1,4 @@ -1 ############################################################################## +############################################################################## # Copyright (c) 2013, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # |