summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorWouter Deconinck <wdconinc@gmail.com>2023-08-21 12:43:11 -0500
committerGitHub <noreply@github.com>2023-08-21 13:43:11 -0400
commited65532e2790af153f31194fdbf2d1b5b92222cc (patch)
treeeda56dba82a3a6009f3f0d3feca61a5a01e3fd2b /var
parent696d4a1b8505bb37c134dee4e22d3c4362b6ec90 (diff)
downloadspack-ed65532e2790af153f31194fdbf2d1b5b92222cc.tar.gz
spack-ed65532e2790af153f31194fdbf2d1b5b92222cc.tar.bz2
spack-ed65532e2790af153f31194fdbf2d1b5b92222cc.tar.xz
spack-ed65532e2790af153f31194fdbf2d1b5b92222cc.zip
singularityce: fix after no spaces in Executable allowed (#39553)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/singularityce/package.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/singularityce/package.py b/var/spack/repos/builtin/packages/singularityce/package.py
index f6e05aa143..9ac49bc224 100644
--- a/var/spack/repos/builtin/packages/singularityce/package.py
+++ b/var/spack/repos/builtin/packages/singularityce/package.py
@@ -79,14 +79,14 @@ class SingularityBase(MakefilePackage):
# Hijack the edit stage to run mconfig.
def edit(self, spec, prefix):
with working_dir(self.build_directory):
- confstring = "./mconfig --prefix=%s" % prefix
- confstring += " " + " ".join(self.config_options)
+ _config_options = ["--prefix=%s" % prefix]
+ _config_options += self.config_options
if "~suid" in spec:
- confstring += " --without-suid"
+ _config_options += " --without-suid"
if "~network" in spec:
- confstring += " --without-network"
- configure = Executable(confstring)
- configure()
+ _config_options += " --without-network"
+ configure = Executable("./mconfig")
+ configure(*_config_options)
# Set these for use by MakefilePackage's default build/install methods.
build_targets = ["-C", "builddir", "parallel=False"]