From cc76673c24ef29d1450d92147f8a67fd1fda98c1 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Fri, 23 Jun 2023 11:27:07 +0200
Subject: [PATCH] ask for the prompt only if force not present
---
src/mpsd_software_manager/mpsd_software.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/mpsd_software_manager/mpsd_software.py b/src/mpsd_software_manager/mpsd_software.py
index 73b4f4d..f264cc4 100755
--- a/src/mpsd_software_manager/mpsd_software.py
+++ b/src/mpsd_software_manager/mpsd_software.py
@@ -1093,18 +1093,20 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
sys.exit(1)
if "ALL" in package_sets:
# we need to remove the entire release folder
- logging.warning(
- f"Removing release {mpsd_release} from {root_dir}"
- "do you want to continue? [y/n]"
- )
- if force_remove or input().lower() == "y":
- folders_to_remove = os.listdir(root_dir / mpsd_release)
+ logging.warning(f"Removing release {mpsd_release} from {root_dir}")
+ if not force_remove:
+ logging.warning("do you want to continue? [y/n]")
+ if input().lower() == "y":
+ force_remove = True
+ if force_remove:
+ dir_to_remove = root_dir / mpsd_release / get_native_microarchitecture()
+ folders_to_remove = os.listdir(dir_to_remove)
# skip logs folder
if "logs" in folders_to_remove:
folders_to_remove.remove("logs")
for folder in folders_to_remove:
- shutil.rmtree(root_dir / mpsd_release / folder)
- sys.exit(0)
+ shutil.rmtree(dir_to_remove / folder)
+ return
for package_set in package_sets:
# we load the spack environment and remove the package_set
spack_env = ""
--
GitLab