From 2ba6bb21fbac14b6eec9b4ba4fb7ea1f11e9df6f Mon Sep 17 00:00:00 2001 From: Mike Nolta Date: Mon, 21 Dec 2015 18:48:30 -0500 Subject: fix #249 (tmp spack-stage directories conflict) --- lib/spack/spack/__init__.py | 5 +++-- 1 file 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 -- cgit v1.2.3-70-g09d2