From fc827066e92d04b6391ded3eafe11b20e42c27b2 Mon Sep 17 00:00:00 2001 From: Georgia Stuart Date: Sun, 27 Mar 2022 10:47:35 -0500 Subject: [PATCH 1/2] Add check for apptainer to fix pull_folder --- spython/main/pull.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spython/main/pull.py b/spython/main/pull.py index d4068af..b9827e9 100644 --- a/spython/main/pull.py +++ b/spython/main/pull.py @@ -72,7 +72,7 @@ def pull( # Regression Singularity 3.* onward, PULLFOLDER not honored # https://github.com/sylabs/singularity/issues/2788 - if "version 3" in self.version(): + if ("version 3" in self.version()) or ('apptainer' in self.version()): name = final_image pull_folder = None # Don't use pull_folder else: From 9736992f80eb7f93a3ff47793e9ea48d00eea5d7 Mon Sep 17 00:00:00 2001 From: Georgia Stuart Date: Sun, 27 Mar 2022 10:51:37 -0500 Subject: [PATCH 2/2] Make parens consistent --- spython/main/pull.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spython/main/pull.py b/spython/main/pull.py index b9827e9..32c3ccc 100644 --- a/spython/main/pull.py +++ b/spython/main/pull.py @@ -72,7 +72,7 @@ def pull( # Regression Singularity 3.* onward, PULLFOLDER not honored # https://github.com/sylabs/singularity/issues/2788 - if ("version 3" in self.version()) or ('apptainer' in self.version()): + if ("version 3" in self.version()) or ("apptainer" in self.version()): name = final_image pull_folder = None # Don't use pull_folder else: