From dea85d10849da9f6bd64ce0f259d92581005a003 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Wed, 2 Oct 2024 12:54:21 +0000 Subject: [PATCH] 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 --- easybuild/tools/version.py | 6 ++---- test/framework/options.py | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/easybuild/tools/version.py b/easybuild/tools/version.py index e8cd07de4a..6941a0e6bf 100644 --- a/easybuild/tools/version.py +++ b/easybuild/tools/version.py @@ -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(): diff --git a/test/framework/options.py b/test/framework/options.py index 7e87b5b7fb..007986c39c 100644 --- a/test/framework/options.py +++ b/test/framework/options.py @@ -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)