Skip to content

Commit 6a6eef6

Browse files
committed
don't let setting --prefix configuration option imply that --failed-installs-build-dirs-path and --failed-installs-logs-path are also set with a default subdirectory, they should be used opt-in
1 parent a4e8856 commit 6a6eef6

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

easybuild/tools/config.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,9 @@
104104
DEFAULT_MNS = 'EasyBuildMNS'
105105
DEFAULT_MODULE_SYNTAX = 'Lua'
106106
DEFAULT_MODULES_TOOL = 'Lmod'
107-
FAILED_INSTALLS_SUBDIR = 'failed-installs'
108107
DEFAULT_PATH_SUBDIRS = {
109108
'buildpath': 'build',
110109
'containerpath': 'containers',
111-
'failed_installs_build_dirs_path': os.path.join(FAILED_INSTALLS_SUBDIR, 'build-dirs'),
112-
'failed_installs_logs_path': os.path.join(FAILED_INSTALLS_SUBDIR, 'logs'),
113110
'installpath': '',
114111
'packagepath': 'packages',
115112
'repositorypath': 'ebfiles_repo',

easybuild/tools/options.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ def _postprocess_config(self):
12181218
# to avoid incorrect paths being used when EasyBuild changes the current working directory
12191219
# (see https://github.com/easybuilders/easybuild-framework/issues/3619);
12201220
# ensuring absolute paths for 'robot' is handled separately below,
1221-
# because we need to be careful with the argument pass to --robot;
1221+
# because we need to be careful with the argument passed to --robot;
12221222
# note: repositorypath is purposely not listed here, because it's a special case:
12231223
# - the value could consist of a 2-tuple (<path>, <relative_subdir>);
12241224
# - the <path> could also specify the location of a *remote* (Git( repository,
@@ -1232,10 +1232,11 @@ def _postprocess_config(self):
12321232
self._ensure_abs_path(opt_name)
12331233

12341234
if self.options.prefix is not None:
1235-
# prefix applies to all paths, and repository has to be reinitialised to take new repositorypath in account
1236-
# in the legacy-style configuration, repository is initialised in configuration file itself
1237-
path_opts = ['buildpath', 'containerpath', 'failed_installs_build_dirs_path', 'failed_installs_logs_path',
1238-
'installpath', 'packagepath', 'repository', 'repositorypath', 'sourcepath']
1235+
# prefix applies to selected path configuration options;
1236+
# repository has to be reinitialised to take new repositorypath in account;
1237+
# in the legacy-style configuration, repository is initialised in configuration file itself;
1238+
path_opts = ['buildpath', 'containerpath', 'installpath', 'packagepath', 'repository', 'repositorypath',
1239+
'sourcepath']
12391240
for dest in path_opts:
12401241
if not self.options._action_taken.get(dest, False):
12411242
if dest == 'repository':

test/framework/options.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5462,8 +5462,6 @@ def test_prefix_option(self):
54625462
expected = [
54635463
'buildpath',
54645464
'containerpath',
5465-
'failed-installs-build-dirs-path',
5466-
'failed-installs-logs-path',
54675465
'installpath',
54685466
'packagepath',
54695467
'prefix',

0 commit comments

Comments
 (0)