Skip to content

Revert resolve templates in CmdCp #3918 #3921

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Revert resolve templates in CmdCp #3918 #3921

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
6 changes: 2 additions & 4 deletions easybuild/easyblocks/generic/cmdcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ def build_step(self):
# determine command to use
# find (first) regex match, then complete matching command template
cmd = None
for pattern, regex_cmd in self.cfg.get_ref('cmds_map'):
pattern = pattern % self.cfg.template_values
regex_cmd = regex_cmd % self.cfg.template_values
for pattern, regex_cmd in self.cfg['cmds_map']:
try:
regex = re.compile(pattern)
except re.error as err:
Expand All @@ -80,6 +78,6 @@ def build_step(self):
break
if cmd is None:
raise EasyBuildError("No match for %s in %s, don't know which command to use.",
src, self.cfg.get_ref('cmds_map'))
src, self.cfg['cmds_map'])

run_shell_cmd(cmd)