Fixes issues introduced after merge with conflicts

2016-01-26 14:11:23 +01:00
parent 093b831799
commit 5e3b7a4247
2 changed files with 2 additions and 2 deletions
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -702,7 +702,7 @@ def do_stage(self, mirror_only=False):
        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()

--- 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.
 #