summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorJon Rood <jon.rood@nrel.gov>2017-08-09 18:50:28 -0500
committerAdam J. Stewart <ajstewart426@gmail.com>2017-08-09 18:50:28 -0500
commit58cdd46ebdd065950b3f76127b30131b19686138 (patch)
treeca5e6bdedc9a37462574f14be309e9ddb7bada1c /var
parent869d40648f62c0864c8336153b568fd388d11253 (diff)
downloadspack-58cdd46ebdd065950b3f76127b30131b19686138.tar.gz
spack-58cdd46ebdd065950b3f76127b30131b19686138.tar.bz2
spack-58cdd46ebdd065950b3f76127b30131b19686138.tar.xz
spack-58cdd46ebdd065950b3f76127b30131b19686138.zip
Adding lower bound to pnetcdf conflict in Trilinos (#5039)
* Adding lower bound to pnetcdf conflict in Trilinos to allow for use of develop and master branch. * Using even lower bound for pnetcdf conflict in Trilinos.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index f8181f77f9..a0d0ccfa3c 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -173,7 +173,7 @@ class Trilinos(CMakePackage):
# deprecated SuperLUDist v3.3 together with an Amesos patch is working.
conflicts('+superlu-dist', when='@11.4.1:11.14.3')
# PnetCDF was only added after v12.10.1
- conflicts('+pnetcdf', when='@:12.10.1')
+ conflicts('+pnetcdf', when='@0:12.10.1')
# ###################### Dependencies ##########################