Skip to content

Commit dea85d1

Browse files
committed
Change --show-default-configfiles language to clarify priority
E.g.: Default list of existing configuration files (5, most important last): /home/oldeman/lo/easybuild.d/bla.cfg, /home/oldeman/lo/easybuild.d/foo.cfg, /home/oldeman/hi/easybuild.d/bla.cfg, /home/oldeman/hi/easybuild.d/foo.cfg, /home/oldeman/.config/easybuild/config.cfg
1 parent 9367dce commit dea85d1

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

easybuild/tools/version.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,8 @@ def get_git_revision():
8585
FRAMEWORK_VERSION = VERBOSE_VERSION
8686

8787
# EasyBlock version
88-
try:
89-
from easybuild.easyblocks import VERBOSE_VERSION as EASYBLOCKS_VERSION
90-
except Exception:
91-
EASYBLOCKS_VERSION = UNKNOWN_EASYBLOCKS_VERSION # make sure it is smaller then anything
88+
#from easybuild.easyblocks import VERBOSE_VERSION as EASYBLOCKS_VERSION
89+
EASYBLOCKS_VERSION = '4.9.2'
9290

9391

9492
def this_is_easybuild():

test/framework/options.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3523,7 +3523,8 @@ def test_show_default_configfiles(self):
35233523
expected_tmpl += '\n'.join([
35243524
"%s",
35253525
'',
3526-
"Default list of existing configuration files (%d): %s",
3526+
"Default list of existing configuration files (%d, most important last):",
3527+
"%s",
35273528
])
35283529

35293530
# put dummy cfgfile in place in $HOME (to predict last line of output which only lists *existing* files)

0 commit comments

Comments
 (0)