Skip to content

Commit

Permalink
Merge pull request #3540 from branfosj/20241220130412_new_pr_configur…
Browse files Browse the repository at this point in the history
…emake

remove use of deprecated `extract_errors_from_log` in `configuremake`
  • Loading branch information
lexming authored Dec 21, 2024
2 parents 90c14fe + f875f97 commit f293fb5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions easybuild/easyblocks/generic/configuremake.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
from easybuild.tools.config import source_paths, build_option, ERROR, IGNORE, WARN
from easybuild.tools.filetools import CHECKSUM_TYPE_SHA256, adjust_permissions, compute_checksum, download_file
from easybuild.tools.filetools import read_file, remove_file
from easybuild.tools.run import extract_errors_from_log, run_shell_cmd
from easybuild.tools.run import run_shell_cmd
from easybuild.tools.utilities import nub

# string that indicates that a configure script was generated by Autoconf
Expand Down Expand Up @@ -339,7 +339,7 @@ def configure_step(self, cmd_prefix=''):
action, ', '.join(valid_actions))
if action != IGNORE:
unrecognized_options_str = 'configure: WARNING: unrecognized options:'
unrecognized_options = extract_errors_from_log(res.output, unrecognized_options_str)[1]
unrecognized_options = re.findall(rf"^{unrecognized_options_str}.*", res.output, flags=re.I | re.M)
# Keep only unique options (remove the warning string and strip whitespace)
unrecognized_options = nub(x.split(unrecognized_options_str)[-1].strip() for x in unrecognized_options)
if unrecognized_options:
Expand Down

0 comments on commit f293fb5

Please sign in to comment.