Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion easybuild/easyblocks/generic/bundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ def __init__(self, *args, **kwargs):
# disable templating to avoid premature resolving of template values
# Note that self.cfg.update also resolves templates!
with self.cfg.disable_templating():
# Clear current top-level checksums (can only be of postinstall patches)
# to append later on to component patches
orig_checksums = self.cfg['checksums']
self.cfg['checksums'] = []

# list of checksums for patches (must be included after checksums for sources)
checksums_patches = []

Expand Down Expand Up @@ -230,12 +235,15 @@ def __init__(self, *args, **kwargs):

with comp_cfg.allow_unresolved_templates():
comp_patches = comp_cfg['patches']
comp_postinstall_patches = comp_cfg['postinstallpatches']
if comp_patches:
self.cfg.update('patches', comp_patches)
# Patch step is skipped so adding postinstall patches of components here is harmless
self.cfg.update('patches', comp_postinstall_patches)

self.comp_instances.append((comp_cfg, comp_cfg.easyblock(comp_cfg, logfile=self.logfile)))

self.cfg.update('checksums', checksums_patches)
self.cfg.update('checksums', checksums_patches + orig_checksums)

# restore general sanity checks if using component-specific sanity checks
if self.cfg['sanity_check_components'] or self.cfg['sanity_check_all_components']:
Expand Down