Skip to content

Commit

Permalink
Merge pull request #3119 from Flamefire/fix_error_display
Browse files Browse the repository at this point in the history
Use correct module for errors_found_in_log
  • Loading branch information
smoors authored Feb 19, 2020
2 parents 49533e6 + 690dff1 commit e453884
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions easybuild/framework/easyblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
from easybuild.framework.easyconfig.tools import get_paths_for
from easybuild.framework.easyconfig.templates import TEMPLATE_NAMES_EASYBLOCK_RUN_STEP, template_constant_dict
from easybuild.framework.extension import resolve_exts_filter_template
from easybuild.tools import config, filetools
from easybuild.tools import config, run
from easybuild.tools.build_details import get_build_stats
from easybuild.tools.build_log import EasyBuildError, dry_run_msg, dry_run_warning, dry_run_set_dirs
from easybuild.tools.build_log import print_error, print_msg, print_warning
Expand Down Expand Up @@ -3088,7 +3088,7 @@ def build_and_install_one(ecdict, init_env):

# restore original environment, and then sanitize it
_log.info("Resetting environment")
filetools.errors_found_in_log = 0
run.errors_found_in_log = 0
restore_env(init_env)
sanitize_env()

Expand Down Expand Up @@ -3239,10 +3239,9 @@ def build_and_install_one(ecdict, init_env):
print_msg("%s: Installation %s %s (took %s)" % (summary, ended, succ, req_time), log=_log, silent=silent)

# check for errors
if filetools.errors_found_in_log > 0:
print_msg("WARNING: %d possible error(s) were detected in the "
"build logs, please verify the build." % filetools.errors_found_in_log,
_log, silent=silent)
if run.errors_found_in_log > 0:
_log.warning("%d possible error(s) were detected in the "
"build logs, please verify the build.", run.errors_found_in_log)

if app.postmsg:
print_msg("\nWARNING: %s\n" % app.postmsg, log=_log, silent=silent)
Expand Down

0 comments on commit e453884

Please sign in to comment.