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

on_package_attributes: pass checks to pkg in builder

Browse Source
This commit is contained in:
Wouter Deconinck 2024-07-20 10:37:40 -05:00 committed by GitHub
parent 5ef222d62f
commit af81387e6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/package_base.py
View File

@ -358,12 +358,14 @@ def on_package_attributes(**attr_dict):
def _execute_under_condition(func): def _execute_under_condition(func):
@functools.wraps(func) @functools.wraps(func)
def _wrapper(instance, *args, **kwargs): def _wrapper(instance, *args, **kwargs):
# Support both builders and packages
pkg = instance.pkg if isinstance(instance, spack.builder.Builder) else instance
# If all the attributes have the value we require, then execute # If all the attributes have the value we require, then execute
has_all_attributes = all([hasattr(instance, key) for key in attr_dict]) has_all_attributes = all([hasattr(pkg, key) for key in attr_dict])
if has_all_attributes: if has_all_attributes:
has_the_right_values = all( has_the_right_values = all(
[ [
getattr(instance, key) == value for key, value in attr_dict.items() getattr(pkg, key) == value for key, value in attr_dict.items()
] # NOQA: ignore=E501 ] # NOQA: ignore=E501
) )
if has_the_right_values: if has_the_right_values: