summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@googlemail.com>2017-08-21 18:20:07 +0200
committerbecker33 <becker33@llnl.gov>2017-08-21 09:20:07 -0700
commit581f70ff6f3bc13d53c98da60fa0fe50fe784f2c (patch)
treeec8f9bd311d703b69de3dd085bf76480f191330c /var
parentbd8ac0a738ba46f773722230a1943feb33197bbb (diff)
downloadspack-581f70ff6f3bc13d53c98da60fa0fe50fe784f2c.tar.gz
spack-581f70ff6f3bc13d53c98da60fa0fe50fe784f2c.tar.bz2
spack-581f70ff6f3bc13d53c98da60fa0fe50fe784f2c.tar.xz
spack-581f70ff6f3bc13d53c98da60fa0fe50fe784f2c.zip
Added custom messages for conflicts directive. fixes #4965 (#5083)
Users can now add an optional custom message to the conflicts directive. Layout on screen has been changed to improve readability and the long spec is shown in tree format. Two conflicts in `espresso` have been modified to showcase the feature.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/espresso/package.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/espresso/package.py b/var/spack/repos/builtin/packages/espresso/package.py
index b77e14ec76..26cbf8fd88 100644
--- a/var/spack/repos/builtin/packages/espresso/package.py
+++ b/var/spack/repos/builtin/packages/espresso/package.py
@@ -75,8 +75,17 @@ class Espresso(Package):
patch('dspev_drv_elpa.patch', when='@6.1 ^elpa@2016.05.003')
# We can't ask for scalapack or elpa if we don't want MPI
- conflicts('+scalapack', when='~mpi')
- conflicts('+elpa', when='~mpi')
+ conflicts(
+ '+scalapack',
+ when='~mpi',
+ msg='scalapack is a parallel library and needs MPI support'
+ )
+
+ conflicts(
+ '+elpa',
+ when='~mpi',
+ msg='elpa is a parallel library and needs MPI support'
+ )
# Elpa is formally supported by @:5.4.0, but QE configure searches
# for it in the wrong folders (or tries to download it within