Skip to content

Commit e453884

Browse files
authored
Merge pull request #3119 from Flamefire/fix_error_display
Use correct module for errors_found_in_log
2 parents 49533e6 + 690dff1 commit e453884

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

easybuild/framework/easyblock.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
from easybuild.framework.easyconfig.tools import get_paths_for
6363
from easybuild.framework.easyconfig.templates import TEMPLATE_NAMES_EASYBLOCK_RUN_STEP, template_constant_dict
6464
from easybuild.framework.extension import resolve_exts_filter_template
65-
from easybuild.tools import config, filetools
65+
from easybuild.tools import config, run
6666
from easybuild.tools.build_details import get_build_stats
6767
from easybuild.tools.build_log import EasyBuildError, dry_run_msg, dry_run_warning, dry_run_set_dirs
6868
from easybuild.tools.build_log import print_error, print_msg, print_warning
@@ -3088,7 +3088,7 @@ def build_and_install_one(ecdict, init_env):
30883088

30893089
# restore original environment, and then sanitize it
30903090
_log.info("Resetting environment")
3091-
filetools.errors_found_in_log = 0
3091+
run.errors_found_in_log = 0
30923092
restore_env(init_env)
30933093
sanitize_env()
30943094

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

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

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

0 commit comments

Comments
 (0)