From c2ce75db4785e85329945594cd0f1629b672782c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCdepohl?= Date: Tue, 31 Mar 2020 10:50:40 +0200 Subject: [PATCH] Fix error in mpcdf_enable_repositories Packages that were completely disabled or enabled only for 'system' were still branched into all sub-projects. --- mpcdf_enable_repositories.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mpcdf_enable_repositories.py b/mpcdf_enable_repositories.py index 3079e93..fae42f0 100644 --- a/mpcdf_enable_repositories.py +++ b/mpcdf_enable_repositories.py @@ -92,7 +92,8 @@ def do_mpcdf_enable_repositories(self, subcmd, opts, *args): if opts.recreate or opts.set or opts.disable: mpcdf_common.mpcdf_enable_repositories(api_url, project, package, verbose=True, dry_run=opts.dry_run) - if project == "software" and opts.set != "system" and not opts.dry_run: + enabled = mpcdf_common.get_attribute_values(api_url, project, package, "MPCDF:enable_repositories") + if project == "software" and enabled != ["system"] and len(enabled) > 1 and not opts.dry_run: mpcdf_common.sync_projects(api_url, package, verbose=True) elif (opts.compiler_modules or opts.mpi_modules or opts.cuda_modules): @@ -100,11 +101,11 @@ def do_mpcdf_enable_repositories(self, subcmd, opts, *args): else: try: - repos = mpcdf_common.get_attribute_values(api_url, project, package, "MPCDF:enable_repositories") + enabled = mpcdf_common.get_attribute_values(api_url, project, package, "MPCDF:enable_repositories") except Exception: - repos = () + enabled = () print("ERRROR: No attribute MPCDF:enable_repositories present, package unmanaged") - if repos: + if enabled: def print_attr(description, attribute_name): try: values = mpcdf_common.get_attribute_values(api_url, project, package, attribute_name) @@ -112,7 +113,7 @@ def do_mpcdf_enable_repositories(self, subcmd, opts, *args): return print(description, ",".join(values)) - print("Enabled for:", ",".join(repos)) + print("Enabled for:", ",".join(enabled)) print_attr("- Subset of compiler modules set to:", "MPCDF:compiler_modules") print_attr("- Subset of MPI modules set to:", "MPCDF:mpi_modules") print_attr("- Subset of CUDA modules set to:", "MPCDF:cuda_modules") -- GitLab