summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Nolta <mike@nolta.net>2015-12-21 18:48:30 -0500
committerMike Nolta <mike@nolta.net>2015-12-21 18:50:58 -0500
commit2ba6bb21fbac14b6eec9b4ba4fb7ea1f11e9df6f (patch)
tree402264c3649276c48897bd3f70aaf8fdf124aa24 /lib
parentc3aaf005e2ec2844fa02a60414978692b67727a4 (diff)
downloadspack-2ba6bb21fbac14b6eec9b4ba4fb7ea1f11e9df6f.tar.gz
spack-2ba6bb21fbac14b6eec9b4ba4fb7ea1f11e9df6f.tar.bz2
spack-2ba6bb21fbac14b6eec9b4ba4fb7ea1f11e9df6f.tar.xz
spack-2ba6bb21fbac14b6eec9b4ba4fb7ea1f11e9df6f.zip
fix #249 (tmp spack-stage directories conflict)
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
index 02eeed01fa..ccd7dc25c8 100644
--- a/lib/spack/spack/__init__.py
+++ b/lib/spack/spack/__init__.py
@@ -112,8 +112,9 @@ use_tmp_stage = True
tmp_dirs = []
_default_tmp = tempfile.gettempdir()
if _default_tmp != os.getcwd():
- tmp_dirs.append(os.path.join(_default_tmp, 'spack-stage'))
-tmp_dirs.append('/nfs/tmp2/%u/spack-stage')
+ tmp_dirs = [ join_path(_default_tmp, '%u', 'spack-stage'),
+ join_path(_default_tmp, 'spack-stage') ]
+tmp_dirs.append('/nfs/tmp2/%u/spack-stage') # TODO: remove
# Whether spack should allow installation of unsafe versions of
# software. "Unsafe" versions are ones it doesn't have a checksum