diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-04-13 10:49:00 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-04-13 10:49:00 +0200 |
| commit | fcd58a95dd879cff6e3e117f1b3b2f8326ab636b (patch) | |
| tree | 167371a3b6312b0c67d4a88693584f4d7221e453 | |
| parent | 41f365112c07dc6e144da92611018ee1fe6bf30b (diff) | |
| parent | c96dd4317405810e4eac0bab79005b0606b4d657 (diff) | |
| download | spack-fcd58a95dd879cff6e3e117f1b3b2f8326ab636b.tar.gz spack-fcd58a95dd879cff6e3e117f1b3b2f8326ab636b.tar.bz2 spack-fcd58a95dd879cff6e3e117f1b3b2f8326ab636b.tar.xz spack-fcd58a95dd879cff6e3e117f1b3b2f8326ab636b.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/custom_modulefile_from_config
| -rw-r--r-- | lib/spack/spack/__init__.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/parallel-netcdf/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-setuptools/package.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index aee11f061f..9108e1d0e3 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -136,9 +136,7 @@ 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: + else: tmp_dirs.append(join_path(path, 'spack-stage')) # Whether spack should allow installation of unsafe versions of diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py index 62a8f7ca0b..e6f8cf026b 100644 --- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py +++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py @@ -8,6 +8,7 @@ class ParallelNetcdf(Package): homepage = "https://trac.mcs.anl.gov/projects/parallel-netcdf" url = "http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/parallel-netcdf-1.6.1.tar.gz" + version('1.7.0', '267eab7b6f9dc78c4d0e6def2def3aea4bc7c9f0') version('1.6.1', '62a094eb952f9d1e15f07d56e535052604f1ac34') depends_on("m4") diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index c6d9be1add..2086d0b3fb 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -10,6 +10,8 @@ class PySetuptools(Package): version('18.1', 'f72e87f34fbf07f299f6cb46256a0b06') version('19.2', '78353b1f80375ca5e088f4b4627ffe03') version('20.5', 'fadc1e1123ddbe31006e5e43e927362b') + version('20.6.7', '45d6110f3ec14924e44c33411db64fe6') + version('20.7.0', '5d12b39bf3e75e80fdce54e44b255615') extends('python') |