diff options
| author | Aiden Grossman <39388941+boomanaiden154@users.noreply.github.com> | 2023-07-17 05:10:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-17 07:10:36 -0500 |
| commit | e91db7793038b4e7235c8ec7c82244afbb9dfc9e (patch) | |
| tree | 2f894781c552736715dbaf4461856f65e0f6e99d /var | |
| parent | 31431f967a59c07585021cba40683c2ca6ff2c47 (diff) | |
| download | spack-e91db7793038b4e7235c8ec7c82244afbb9dfc9e.tar.gz spack-e91db7793038b4e7235c8ec7c82244afbb9dfc9e.tar.bz2 spack-e91db7793038b4e7235c8ec7c82244afbb9dfc9e.tar.xz spack-e91db7793038b4e7235c8ec7c82244afbb9dfc9e.zip | |
root: Add package name to all conflict messages (#38920)
Not having the package name in the conflict messages can make debugging
conflicts exceedingly hard when trying to concretize an environment with
a sufficient number of packages. This patch adds the package name to all
of the conflict messages so that it is easy to tell just from the
message which package is causing conflicts.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 347eb46d0f..dc172d4851 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -277,11 +277,13 @@ class Root(CMakePackage): depends_on("sqlite", when="+sqlite") depends_on("tbb", when="+tbb") # See: https://github.com/root-project/root/issues/6933 - conflicts("^intel-tbb@2021.1:", when="@:6.22", msg="Please use an older intel-tbb version") + conflicts( + "^intel-tbb@2021.1:", when="@:6.22", msg="Please use an older intel-tbb version for ROOT" + ) conflicts( "^intel-oneapi-tbb@2021.1:", when="@:6.22", - msg="Please use an older intel-tbb/intel-oneapi-tbb version", + msg="Please use an older intel-tbb/intel-oneapi-tbb version for ROOT", ) # depends_on('intel-tbb@:2021.0', when='@:6.22 ^intel-tbb') depends_on("unuran", when="+unuran") @@ -311,20 +313,22 @@ class Root(CMakePackage): # Incompatible variants if sys.platform != "darwin": - conflicts("+opengl", when="~x", msg="OpenGL requires X") - conflicts("+math", when="~gsl", msg="Math requires GSL") - conflicts("+tmva", when="~gsl", msg="TVMA requires GSL") - conflicts("+tmva", when="~mlp", msg="TVMA requires MLP") + conflicts("+opengl", when="~x", msg="root+opengl requires X") + conflicts("+math", when="~gsl", msg="root+math requires GSL") + conflicts("+tmva", when="~gsl", msg="root+tmva requires GSL") + conflicts("+tmva", when="~mlp", msg="root+tmva requires MLP") conflicts("cxxstd=11", when="+root7", msg="root7 requires at least C++14") conflicts("cxxstd=11", when="@6.25.02:", msg="This version of root requires at least C++14") - conflicts("cxxstd=20", when="@:6.28.02", msg="C++20 support requires at least version 6.28.04") + conflicts( + "cxxstd=20", when="@:6.28.02", msg="C++20 support requires root version at least 6.28.04" + ) # See https://github.com/root-project/root/issues/11128 - conflicts("%clang@16:", when="@:6.26.07", msg="clang 16+ support was added in 6.26.08") + conflicts("%clang@16:", when="@:6.26.07", msg="clang 16+ support was added in root 6.26.08") # See https://github.com/root-project/root/issues/11714 if sys.platform == "darwin" and macos_version() >= Version("13"): - conflicts("@:6.26.09", msg="macOS 13 support was added in 6.26.10") + conflicts("@:6.26.09", msg="macOS 13 support was added in root 6.26.10") # ROOT <6.14 is incompatible with Python >=3.7, which is the minimum supported by spack conflicts("+python", when="@:6.13", msg="Spack wants python >=3.7, too new for ROOT <6.14") |