Skip to content

Commit bc79716

Browse files
committed
Extend patch search logic to components
1 parent 0653e2d commit bc79716

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

easybuild/tools/github.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,11 +1013,13 @@ def is_patch_for(patch_name, ec):
10131013

10141014
patches = copy.copy(ec['patches'])
10151015

1016-
for ext in ec.get_ref('exts_list'):
1017-
if isinstance(ext, (list, tuple)) and len(ext) == 3 and isinstance(ext[2], dict):
1018-
templates = {'name': ext[0], 'version': ext[1]}
1019-
ext_options = ext[2]
1020-
patches.extend(p % templates for p in ext_options.get('patches', []))
1016+
with ec.disable_templating():
1017+
for ext in itertools.chain(ec['exts_list'], ec.get('components', [])):
1018+
if isinstance(ext, (list, tuple)) and len(ext) == 3 and isinstance(ext[2], dict):
1019+
templates = {'name': ext[0], 'version': ext[1]}
1020+
ext_options = ext[2]
1021+
patches.extend(p[0] % templates if isinstance(p, (tuple, list)) else p % templates
1022+
for p in ext_options.get('patches', []))
10211023

10221024
for patch in patches:
10231025
if isinstance(patch, (tuple, list)):

0 commit comments

Comments
 (0)