Merge branch 'nolta-249' into develop

This commit is contained in:
Todd Gamblin 2015-12-22 07:56:10 -08:00
commit 642ee87fcc

View file

@ -24,6 +24,7 @@
##############################################################################
import os
import tempfile
import getpass
from llnl.util.filesystem import *
# This lives in $prefix/lib/spack/spack/__file__
@ -111,9 +112,17 @@
# that it can create.
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_user = getpass.getuser()
_tmp_candidates = (_default_tmp, '/nfs/tmp2', '/tmp', '/var/tmp')
for path in _tmp_candidates:
# don't add a second username if it's already unique by user.
if not _tmp_user in path:
tmp_dirs.append(join_path(path, '%u', 'spack-stage'))
for path in _tmp_candidates:
if not path in tmp_dirs:
tmp_dirs.append(join_path(path, 'spack-stage'))
# Whether spack should allow installation of unsafe versions of
# software. "Unsafe" versions are ones it doesn't have a checksum