From f23d154eb75b72767557f78a178eb31ae9ac9d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 29 Oct 2024 11:47:33 +0100 Subject: [PATCH] use proper fix for the yes|no check, taking into account that the values are concatened --- easybuild/easyblocks/s/score_p.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyblocks/s/score_p.py b/easybuild/easyblocks/s/score_p.py index 720339c00e..67faf8d118 100644 --- a/easybuild/easyblocks/s/score_p.py +++ b/easybuild/easyblocks/s/score_p.py @@ -57,7 +57,7 @@ def configure_step(self, *args, **kwargs): # Let configure scripts specifically check for yes|no instead of *yes*|*no*, # to prevent errors for certain dependencies installed in a path that includes "yes" or "no" # see https://gitlab.com/score-p/scorep/-/issues/1008 - yes_no_regex = (r'\*yes\*\|\*no\*', r'yes|no') + yes_no_regex = (r'\*yes\*\|\*no\*', r'yes,\*\|no,\*\|\*,yes\|\*,no') configure_scripts = glob.glob(os.path.join(self.start_dir, 'build-*', 'configure')) for configure_script in configure_scripts: apply_regex_substitutions(configure_script, [yes_no_regex])