Skip to content

Commit

Permalink
Change --show-default-configfiles language to clarify priority
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bartoldeman committed Oct 2, 2024
1 parent 9367dce commit dea85d1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 2 additions & 4 deletions easybuild/tools/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,8 @@ def get_git_revision():
FRAMEWORK_VERSION = VERBOSE_VERSION

# EasyBlock version
try:
from easybuild.easyblocks import VERBOSE_VERSION as EASYBLOCKS_VERSION
except Exception:
EASYBLOCKS_VERSION = UNKNOWN_EASYBLOCKS_VERSION # make sure it is smaller then anything
#from easybuild.easyblocks import VERBOSE_VERSION as EASYBLOCKS_VERSION
EASYBLOCKS_VERSION = '4.9.2'


def this_is_easybuild():
Expand Down
3 changes: 2 additions & 1 deletion test/framework/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -3523,7 +3523,8 @@ def test_show_default_configfiles(self):
expected_tmpl += '\n'.join([
"%s",
'',
"Default list of existing configuration files (%d): %s",
"Default list of existing configuration files (%d, most important last):",
"%s",
])

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

0 comments on commit dea85d1

Please sign in to comment.