Skip to content

Remove use of unsupported source key in patch spec #4924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2025
Merged

Remove use of unsupported source key in patch spec #4924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions easybuild/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2830,8 +2830,6 @@ def patch_step(self, beginpath=None, patches=None):
self.log.info("Applying patch %s" % patch['name'])
trace_msg("applying patch %s" % patch['name'])

# patch source at specified index (first source if not specified)
srcind = patch.get('source', 0)
# if patch level is specified, use that (otherwise let apply_patch derive patch level)
level = patch.get('level', None)
# determine suffix of source path to apply patch in (if any)
Expand All @@ -2840,16 +2838,14 @@ def patch_step(self, beginpath=None, patches=None):
copy_patch = 'copy' in patch and 'sourcepath' not in patch
options = patch.get('opts', None) # Extra options for patch command

self.log.debug("Source index: %s; patch level: %s; source path suffix: %s; copy patch: %s; options: %s",
srcind, level, srcpathsuffix, copy_patch, options)
self.log.debug("Patch level: %s; source path suffix: %s; copy patch: %s; options: %s",
level, srcpathsuffix, copy_patch, options)

if beginpath is None:
try:
beginpath = self.src[srcind]['finalpath']
self.log.debug("Determine begin path for patch %s: %s" % (patch['name'], beginpath))
except IndexError as err:
raise EasyBuildError("Can't apply patch %s to source at index %s of list %s: %s",
patch['name'], srcind, self.src, err)
if not self.src:
raise EasyBuildError("Can't apply patch %s to source if no sources are given", patch['name'])
beginpath = self.src[0]['finalpath']
self.log.debug("Determined begin path for patch %s: %s" % (patch['name'], beginpath))
else:
self.log.debug("Using specified begin path for patch %s: %s" % (patch['name'], beginpath))

Expand Down