Skip to content

print potential errors after running a command only once #4065

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
smoors merged 1 commit into from
May 12, 2023
Merged

print potential errors after running a command only once #4065

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
24 changes: 13 additions & 11 deletions easybuild/tools/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,19 +623,19 @@ def parse_cmd_output(cmd, stdouterr, ec, simple, log_all, log_ok, regexp):
"""
if strictness == IGNORE:
check_ec = False
use_regexp = False
fail_on_error_match = False
elif strictness == WARN:
check_ec = True
use_regexp = False
fail_on_error_match = False
elif strictness == ERROR:
check_ec = True
use_regexp = True
fail_on_error_match = True
else:
raise EasyBuildError("invalid strictness setting: %s", strictness)

# allow for overriding the regexp setting
if not regexp:
use_regexp = False
fail_on_error_match = False

if ec and (log_all or log_ok):
# We don't want to error if the user doesn't care
Expand All @@ -650,14 +650,16 @@ def parse_cmd_output(cmd, stdouterr, ec, simple, log_all, log_ok, regexp):
_log.debug('cmd "%s" exited with exit code %s and output:\n%s' % (cmd, ec, stdouterr))

# parse the stdout/stderr for errors when strictness dictates this or when regexp is passed in
if use_regexp or regexp:
res = parse_log_for_error(stdouterr, regexp, msg="Command used: %s" % cmd)
if len(res) > 0:
message = "Found %s errors in command output (output: %s)" % (len(res), "\n\t".join([r[0] for r in res]))
if use_regexp:
raise EasyBuildError(message)
if fail_on_error_match or regexp:
res = parse_log_for_error(stdouterr, regexp, stdout=False)
if res:
errors = "\n\t" + "\n\t".join([r[0] for r in res])
error_str = "error" if len(res) == 1 else "errors"
if fail_on_error_match:
raise EasyBuildError("Found %s %s in output of %s:%s", len(res), error_str, cmd, errors)
else:
_log.warning(message)
_log.warning("Found %s potential %s (some may be harmless) in output of %s:%s",
len(res), error_str, cmd, errors)

if simple:
if ec:
Expand Down