From bda2af790a5cfd0a657d8d9de992acfbabfc7f3d Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Mon, 13 Sep 2021 11:47:41 -0600
Subject: [PATCH] remove scaffold for single images
---
.../pexable/carta_envoy/carta_envoy/carta.py | 26 +------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/apps/cli/executables/pexable/carta_envoy/carta_envoy/carta.py b/apps/cli/executables/pexable/carta_envoy/carta_envoy/carta.py
index 77da18ada..51c7a66e3 100644
--- a/apps/cli/executables/pexable/carta_envoy/carta_envoy/carta.py
+++ b/apps/cli/executables/pexable/carta_envoy/carta_envoy/carta.py
@@ -68,28 +68,6 @@ def ensure_non_relative_path(location: str) -> Path:
return Path(location)
-def scaffold(settings: dict):
- if settings["single_image"]:
- directory = settings["data_location"] / settings["image_name"]
- logger.info(f"Current working directory: {os.getcwd()}")
- if Path(directory).exists() and Path(directory / settings["image_name"]).is_file():
- logger.info("Image file already exists! Proceeding...")
- os.chdir(directory)
- logger.info(f"Working directory is now {os.getcwd()}")
- return
- else:
- logger.info(
- "Image file not found. Product Fetch may still be in progress. Scaffolding structure for carta..."
- )
- os.mkdir(settings["image_name"])
- os.chdir(directory)
- os.chmod(os.getcwd(), 0o770)
- # logger.info(f"Working directory is now {os.getcwd()}")
- Path(directory / settings["image_name"]).touch()
- os.chmod(Path(directory / settings["image_name"]), 0o770)
- os.chdir(settings["data_location"])
-
-
def ensure_correct_directory(settings: dict):
directory = settings["data_location"]
logger.info(f"Current working directory: {os.getcwd()}")
@@ -190,9 +168,7 @@ def main():
settings["image_name"] = args.image[0]
if args.single:
settings["single_image"] = True
- if args.parallel:
- scaffold(settings)
- else:
+ if not args.parallel:
ensure_correct_directory(settings)
carta = CartaLauncher(settings)
--
GitLab