zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: python tix detection blocks reuse (#34768)

Browse Source 
Now that the `tix` variant is conditional, it should also be detected
condititionally, otherwise the spec is invalid and cannot be used during
concretization.
This commit is contained in:
Harmen Stoppels 2023-01-11 18:04:20 +01:00 committed by GitHub
parent 781c4823e6
commit 07499f2355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/python/package.py
View File

@ -298,11 +298,12 @@ def determine_variants(cls, exes, version_str):
variants += "~pyexpat" variants += "~pyexpat"
# Some variant names do not match module names # Some variant names do not match module names
try: if "+tkinter" in variants:
python("-c", "import tkinter.tix", error=os.devnull) try:
variants += "+tix" python("-c", "import tkinter.tix", error=os.devnull)
except ProcessError: variants += "+tix"
variants += "~tix" except ProcessError:
variants += "~tix"
# Some modules are platform-dependent # Some modules are platform-dependent
if not is_windows: if not is_windows: