From 7ebbee170f804cb2f5b188690b71189cc1df843d Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Wed, 2 Oct 2024 13:08:28 +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/options.py | 3 ++- test/framework/options.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/tools/options.py b/easybuild/tools/options.py index cd2045bb54..c927b841a2 100644 --- a/easybuild/tools/options.py +++ b/easybuild/tools/options.py @@ -1337,7 +1337,8 @@ def show_default_configfiles(self): "* system-level: %s" % os.path.join('${XDG_CONFIG_DIRS:-/etc/xdg}', 'easybuild.d', '*.cfg'), " -> %s => %s" % (system_cfg_glob_paths, ', '.join(flatten(DEFAULT_SYS_CFGFILES)) or "(no matches)"), '', - "Default list of existing configuration files (%d): %s" % (found_cfgfile_cnt, found_cfgfile_list), + "Default list of existing configuration files (%d, most important last):" % found_cfgfile_cnt, + found_cfgfile_list, ] return '\n'.join(lines) 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)