Skip to content

Commit 74c3162

Browse files
committed
Silence output of included easyblocks for --terse
1 parent a0c1816 commit 74c3162

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

easybuild/tools/options.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
from easybuild.tools.config import EBROOT_ENV_VAR_ACTIONS, ERROR, FORCE_DOWNLOAD_CHOICES, GENERAL_CLASS, IGNORE
7777
from easybuild.tools.config import JOB_DEPS_TYPE_ABORT_ON_ERROR, JOB_DEPS_TYPE_ALWAYS_RUN, LOADED_MODULES_ACTIONS
7878
from easybuild.tools.config import LOCAL_VAR_NAMING_CHECK_WARN, LOCAL_VAR_NAMING_CHECKS
79-
from easybuild.tools.config import OUTPUT_STYLE_AUTO, OUTPUT_STYLES, WARN
79+
from easybuild.tools.config import OUTPUT_STYLE_AUTO, OUTPUT_STYLES, WARN, build_option
8080
from easybuild.tools.config import get_pretend_installpath, init, init_build_options, mk_full_default_path
8181
from easybuild.tools.config import BuildOptions, ConfigurationVariables
8282
from easybuild.tools.configobj import ConfigObj, ConfigObjError
@@ -1572,6 +1572,7 @@ def check_included_multiple(included_easyblocks_from, source):
15721572
print_warning(warning_msg)
15731573

15741574
if options.include_easyblocks_from_pr or options.include_easyblocks_from_commit:
1575+
terse = build_option('terse')
15751576

15761577
if options.include_easyblocks:
15771578
# check if you are including the same easyblock twice
@@ -1593,7 +1594,7 @@ def check_included_multiple(included_easyblocks_from, source):
15931594
included_easyblocks |= included_from_pr
15941595

15951596
for easyblock in included_from_pr:
1596-
print_msg("easyblock %s included from PR #%s" % (easyblock, easyblock_pr), log=log)
1597+
print_msg("easyblock %s included from PR #%s" % (easyblock, easyblock_pr), log=log, silent=terse)
15971598

15981599
include_easyblocks(options.tmpdir, easyblocks_from_pr)
15991600

@@ -1606,7 +1607,8 @@ def check_included_multiple(included_easyblocks_from, source):
16061607
check_included_multiple(included_from_commit, "commit %s" % easyblock_commit)
16071608

16081609
for easyblock in included_from_commit:
1609-
print_msg("easyblock %s included from commit %s" % (easyblock, easyblock_commit), log=log)
1610+
print_msg("easyblock %s included from commit %s" % (easyblock, easyblock_commit),
1611+
log=log, silent=terse)
16101612

16111613
include_easyblocks(options.tmpdir, easyblocks_from_commit)
16121614

0 commit comments

Comments
 (0)