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

Fix user specs which include already-installed packages (#5939)

Browse Source 
* when a user-provided spec refers to an already-installed package, packages with patches applied were causing validation errors based on the recorded variants in the package's class

* avoid checks on all reserved variants (not just 'patches')
This commit is contained in:
scheibelp 2017-11-01 18:44:31 -07:00 committed by Todd Gamblin
parent 7d0c6361ee
commit 60a485591c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/spack/spack/spec.py
View File

@ -2225,7 +2225,10 @@ def validate_or_raise(self):
if not spec.virtual: if not spec.virtual:
pkg_cls = spec.package_class pkg_cls = spec.package_class
pkg_variants = pkg_cls.variants pkg_variants = pkg_cls.variants
not_existing = set(spec.variants) - set(pkg_variants) # reserved names are variants that may be set on any package
# but are not necessarily recorded by the package's class
not_existing = set(spec.variants) - (
set(pkg_variants) | set(spack.directives.reserved_names))
if not_existing: if not_existing:
raise UnknownVariantError(spec.name, not_existing) raise UnknownVariantError(spec.name, not_existing)

3
lib/spack/spack/variant.py
View File

@ -31,6 +31,7 @@
import re import re
import llnl.util.lang as lang import llnl.util.lang as lang
import spack
import spack.error as error import spack.error as error
from six import StringIO from six import StringIO
@ -592,6 +593,8 @@ def substitute_abstract_variants(spec):
spec: spec on which to operate the substitution spec: spec on which to operate the substitution
""" """
for name, v in spec.variants.items(): for name, v in spec.variants.items():
if name in spack.directives.reserved_names:
continue
pkg_variant = spec.package_class.variants[name] pkg_variant = spec.package_class.variants[name]
new_variant = pkg_variant.make_variant(v._original_value) new_variant = pkg_variant.make_variant(v._original_value)
pkg_variant.validate_or_raise(new_variant, spec.package_class) pkg_variant.validate_or_raise(new_variant, spec.package_class)