Merge pull request #4765 from Flamefire/silence-include

Silence output of included easyblocks for `--terse`
easybuilders · Feb 18, 2025 · 5fd677b · 5fd677b
2 parents a0c1816 + 74c3162
commit 5fd677b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/easybuild/tools/options.py b/easybuild/tools/options.py
@@ -76,7 +76,7 @@
 from easybuild.tools.config import EBROOT_ENV_VAR_ACTIONS, ERROR, FORCE_DOWNLOAD_CHOICES, GENERAL_CLASS, IGNORE
 from easybuild.tools.config import JOB_DEPS_TYPE_ABORT_ON_ERROR, JOB_DEPS_TYPE_ALWAYS_RUN, LOADED_MODULES_ACTIONS
 from easybuild.tools.config import LOCAL_VAR_NAMING_CHECK_WARN, LOCAL_VAR_NAMING_CHECKS
-from easybuild.tools.config import OUTPUT_STYLE_AUTO, OUTPUT_STYLES, WARN
+from easybuild.tools.config import OUTPUT_STYLE_AUTO, OUTPUT_STYLES, WARN, build_option
 from easybuild.tools.config import get_pretend_installpath, init, init_build_options, mk_full_default_path
 from easybuild.tools.config import BuildOptions, ConfigurationVariables
 from easybuild.tools.configobj import ConfigObj, ConfigObjError
@@ -1572,6 +1572,7 @@ def check_included_multiple(included_easyblocks_from, source):
             print_warning(warning_msg)
 
     if options.include_easyblocks_from_pr or options.include_easyblocks_from_commit:
+        terse = build_option('terse')
 
         if options.include_easyblocks:
             # check if you are including the same easyblock twice
@@ -1593,7 +1594,7 @@ def check_included_multiple(included_easyblocks_from, source):
                     included_easyblocks |= included_from_pr
 
                 for easyblock in included_from_pr:
-                    print_msg("easyblock %s included from PR #%s" % (easyblock, easyblock_pr), log=log)
+                    print_msg("easyblock %s included from PR #%s" % (easyblock, easyblock_pr), log=log, silent=terse)
 
                 include_easyblocks(options.tmpdir, easyblocks_from_pr)
 
@@ -1606,7 +1607,8 @@ def check_included_multiple(included_easyblocks_from, source):
                 check_included_multiple(included_from_commit, "commit %s" % easyblock_commit)
 
             for easyblock in included_from_commit:
-                print_msg("easyblock %s included from commit %s" % (easyblock, easyblock_commit), log=log)
+                print_msg("easyblock %s included from commit %s" % (easyblock, easyblock_commit),
+                          log=log, silent=terse)
 
             include_easyblocks(options.tmpdir, easyblocks_from_commit)