From bd6f1ac2a984aa8753b0ef9c2939f569908186af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Andr=C3=A9=20Reuter?= Date: Wed, 4 Dec 2024 10:19:29 +0100 Subject: [PATCH] Bundle: Address review comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan André Reuter --- easybuild/easyblocks/generic/bundle.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyblocks/generic/bundle.py b/easybuild/easyblocks/generic/bundle.py index dd17b82a83..2571df7f32 100644 --- a/easybuild/easyblocks/generic/bundle.py +++ b/easybuild/easyblocks/generic/bundle.py @@ -322,15 +322,15 @@ def install_step(self): def make_module_req_guess(self): """ - Set module requirements from all comppnents, e.g. $PATH, etc. + Set module requirements from all components, e.g. $PATH, etc. During the install step, we only set these requirements temporarily. Later on when building the module, those paths are not considered. Therefore, iterate through all the components again and gather the requirements. - Do not remove duplicates or check for existance of folders, + Do not remove duplicates or check for existence of folders, as this is done in the generic EasyBlock while creating - the modulefile already. + the module file already. """ # Start with the paths from the generic EasyBlock. # If not added here, they might be missing entirely and fail sanity checks. @@ -342,10 +342,10 @@ def make_module_req_guess(self): try: for key, value in sorted(reqs.items()): - if isinstance(reqs, string_type): + if isinstance(value, string_type): value = [value] final_reqs.setdefault(key, []) - final_reqs[key] += value + final_reqs[key].append(value) except AttributeError: raise EasyBuildError("Cannot process module requirements of bundle component %s v%s", cfg['name'], cfg['version'])