From daa06794819cfa3a19da803096b7a69af74c10cf Mon Sep 17 00:00:00 2001 From: Miguel Dias Costa Date: Sat, 31 Jul 2021 14:37:37 +0800 Subject: [PATCH] include easyblocks from multiple PRs at the same time --- easybuild/tools/options.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easybuild/tools/options.py b/easybuild/tools/options.py index 7dadcd415d..4df8aad6d8 100644 --- a/easybuild/tools/options.py +++ b/easybuild/tools/options.py @@ -1510,6 +1510,7 @@ def set_up_configuration(args=None, logfile=None, testing=False, silent=False): included_paths = expand_glob_paths(eb_go.options.include_easyblocks) included_from_file = set([os.path.basename(eb) for eb in included_paths]) + easyblocks_from_all_prs = [] for easyblock_pr in easyblock_prs: easyblocks_from_pr = fetch_easyblocks_from_pr(easyblock_pr) included_from_pr = set([os.path.basename(eb) for eb in easyblocks_from_pr]) @@ -1525,7 +1526,9 @@ def set_up_configuration(args=None, logfile=None, testing=False, silent=False): for easyblock in included_from_pr: print_msg("easyblock %s included from PR #%s" % (easyblock, easyblock_pr), log=log) - include_easyblocks(eb_go.options.tmpdir, easyblocks_from_pr) + easyblocks_from_all_prs.extend(easyblocks_from_pr) + + include_easyblocks(eb_go.options.tmpdir, easyblocks_from_all_prs) if eb_go.options.list_easyblocks: msg = list_easyblocks(eb_go.options.list_easyblocks, eb_go.options.output_format)