From 5e3b7a424765ee64f71192bdca129c104a1246f6 Mon Sep 17 00:00:00 2001
From: alalazo <massimiliano.culpo@googlemail.com>
Date: Tue, 26 Jan 2016 14:11:23 +0100
Subject: [PATCH] Fixes issues introduced after merge with conflicts

---
 lib/spack/spack/package.py | 2 +-
 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 @@ 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()
 
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.
 #