diff options
| author | citibeth <rpf2116@columbia.edu> | 2016-03-25 15:36:54 -0400 |
|---|---|---|
| committer | citibeth <rpf2116@columbia.edu> | 2016-03-25 15:36:54 -0400 |
| commit | 8019748396f65feadcdea2854921b6fcc9411e02 (patch) | |
| tree | 9c2dfab3c49c97838b6b54902b5ed830254c441e /share | |
| parent | 6f26c45143e63ee339f9aabc654684056b60654f (diff) | |
| parent | 38ea75e8ca65dd6c896fe7856efdb1d8355ec524 (diff) | |
| download | spack-8019748396f65feadcdea2854921b6fcc9411e02.tar.gz spack-8019748396f65feadcdea2854921b6fcc9411e02.tar.bz2 spack-8019748396f65feadcdea2854921b6fcc9411e02.tar.xz spack-8019748396f65feadcdea2854921b6fcc9411e02.zip | |
Merge remote-tracking branch 'upstream/develop' into efischer/160311-StagedPackage
# Conflicts:
# lib/spack/spack/package.py
Diffstat (limited to 'share')
| -rwxr-xr-x | share/spack/setup-env.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 586a5b836b..764af68400 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -141,7 +141,7 @@ function _spack_pathadd { fi # Do the actual prepending here. - eval "_pa_oldvalue=\$${_pa_varname}" + eval "_pa_oldvalue=\${${_pa_varname}:-}" if [ -d "$_pa_new_path" ] && [[ ":$_pa_oldvalue:" != *":$_pa_new_path:"* ]]; then if [ -n "$_pa_oldvalue" ]; then |