From 2508295d81afcf5aabcdeb726da35f9ac54810b2 Mon Sep 17 00:00:00 2001
From: Carson Woods <cwoods289@gmail.com>
Date: Mon, 15 Jul 2019 11:23:05 -0600
Subject: [PATCH] Fix error caused by SPACK_PATH environment variable not
 existing

---
 lib/spack/spack/cmd/install.py |  8 +++++++-
 lib/spack/spack/stage.py       | 35 ++++++++++++++++++++++++++++------
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py
index 359c9bae354..22a76d5ddc5 100644
--- a/lib/spack/spack/cmd/install.py
+++ b/lib/spack/spack/cmd/install.py
@@ -178,7 +178,13 @@ def default_log_file(spec):
     basename = fmt.format(x=spec, hash=spec.dag_hash())
 
     if spack.config.get('config:shared'):
-        dirname = fs.os.path.join(os.environ['SPACK_PATH'],
+        if 'SPACK_PATH' in os.environ:
+            spack_path = os.environ['SPACK_PATH']
+        else:
+            spack_path = os.path.expanduser('~/.spack/')
+
+    if spack.config.get('config:shared'):
+        dirname = fs.os.path.join(spack_path,
                                   'var/',
                                   'junit-report')
     else:
diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py
index 390e311bd03..4c2d3d7e694 100644
--- a/lib/spack/spack/stage.py
+++ b/lib/spack/spack/stage.py
@@ -67,9 +67,18 @@ def get_tmp_root():
         return None
 
     if _tmp_root is None:
+
         if spack.config.get('config:shared'):
-            candidates = os.path.join(os.environ['SPACK_PATH'],
-                                      'var/spack/stage')
+            if 'SPACK_PATH' in os.environ:
+                spack_path = os.path.join(os.environ['SPACK_PATH'])
+            else:
+                spack_path = os.path.expanduser('~/.spack/')
+
+        if spack.config.get('config:shared'):
+            if 'SPACK_PATH' in os.environ:
+                candidates = os.path.join(spack_path,
+                                          'var/spack/stage')
+                
         else:
             candidates = spack.config.get('config:build_stage')
 
@@ -197,16 +206,24 @@ def __init__(
             self.name = _stage_prefix + next(tempfile._get_candidate_names())
         self.mirror_path = mirror_path
 
+        # Determine SPACK_PATH variable
+        if spack.config.get('config:shared'):
+           if 'SPACK_PATH' in os.environ:
+               spack_path = os.path.join(os.environ['SPACK_PATH'])
+           else:
+               spack_path = os.path.expanduser('~/.spack/')
+
+
         # Try to construct here a temporary name for the stage directory
         # If this is a named stage, then construct a named path.
         if path is not None:
             self.path = path
         elif spack.config.get('config:shared'):
             try:
-                os.mkdir(os.environ['SPACK_PATH'] + '/var/spack/stage')
+                os.mkdir(os.path.join(spack_path, '/var/spack/stage'))
             except OSError:
                 pass
-            self.path = os.path.join(os.environ['SPACK_PATH'],
+            self.path = os.path.join(spack_path,
                                      'var/spack/stage/',
                                      self.name)
         else:
@@ -225,7 +242,7 @@ def __init__(
                 lock_id = prefix_bits(sha1, bit_length(sys.maxsize))
 
                 if spack.config.get('config:shared'):
-                    stage_lock_path = os.path.join(os.environ['SPACK_PATH'],
+                    stage_lock_path = os.path.join(spack_path,
                                                    'var/spack/stage', '.lock')
                 else:
                     stage_lock_path = os.path.join(spack.paths.stage_path,
@@ -482,9 +499,15 @@ def create(self):
         spack.paths.stage_path.
 
         """
+        if spack.config.get('config:shared'):
+           if 'SPACK_PATH' in os.environ:
+               spack_path = os.path.join(os.environ['SPACK_PATH'])
+           else:
+               spack_path = os.path.expanduser('~/.spack/')
+
         # Create the top-level stage directory
         if spack.config.get('config:shared'):
-            mkdirp(os.path.join(os.environ['SPACK_PATH'], 'var/spack/stage'))
+            mkdirp(os.path.join(spack_path, 'var/spack/stage'))
         else:
             mkdirp(spack.paths.stage_path)
         remove_if_dead_link(self.path)