summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-03-22 15:57:35 +0100
committeralalazo <massimiliano.culpo@googlemail.com>2016-03-22 15:57:35 +0100
commit6e847b7d76acf2fb6cda3ef251c311c011008d40 (patch)
tree60beafd21cc2f45a6acfbaa2de7301b3d98729a1 /share
parent4b22c2406c163c83998de8938b5fefa18886057e (diff)
parente32eb7e990119288e0bbffe1786b5cd20547e0ad (diff)
downloadspack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.gz
spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.bz2
spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.xz
spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.zip
Merge branch 'develop' of https://github.com/LLNL/spack into qa/coding_standard
Conflicts: .travis.yml
Diffstat (limited to 'share')
-rwxr-xr-xshare/spack/setup-env.sh2
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