Skip to content

Commit 9e6642d

Browse files
committed
Consistently use "paths" plural
1 parent 2aa7790 commit 9e6642d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

easybuild/framework/easyblock.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,12 +1478,12 @@ def make_module_extra(self, altroot=None, altversion=None):
14781478
'list, dict or str')
14791479
elif isinstance(value, dict):
14801480
if 'paths' not in value or 'delimiter' not in value:
1481-
raise EasyBuildError(f'{name} dict value "{value}" must contain "path" and "delimiter"')
1481+
raise EasyBuildError(f'{name} dict value "{value}" must contain "paths" and "delimiter"')
14821482

14831483
paths = value['paths']
14841484
delim = value['delimiter']
14851485
if not isinstance(paths, (list, str)):
1486-
raise EasyBuildError('modextrapaths dict value "{value}" path must be list or str')
1486+
raise EasyBuildError('modextrapaths dict value "{value}" paths must be list or str')
14871487
if not isinstance(delim, str):
14881488
raise EasyBuildError('modextrapaths dict value "{value}" delimiter must be a str')
14891489
lines.append(self.module_generator.update_paths(key, value, prepend=prepend, delim=delim,

test/framework/easyblock.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ def test_make_module_step(self):
12591259
modextrapaths = {
12601260
'PATH': ('xbin', 'pibin'),
12611261
'CPATH': 'pi/include',
1262-
'TCLLIBPATH': {'path': 'pi', 'delimiter': ' '},
1262+
'TCLLIBPATH': {'paths': 'pi', 'delimiter': ' '},
12631263
}
12641264
modextrapaths_append = {'APPEND_PATH': 'append_path'}
12651265
self.contents = '\n'.join([

0 commit comments

Comments
 (0)