Skip to content
Snippets Groups Projects
Commit bda2af79 authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

remove scaffold for single images

parent 2e11c652
No related branches found
No related tags found
3 merge requests!499Fixing pulling images out of subdirectories for REAL,!498WS-645: Move images out of subdirectories,!497fix single image carta crashing
Pipeline #2857 passed
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment