From ed65532e2790af153f31194fdbf2d1b5b92222cc Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 21 Aug 2023 12:43:11 -0500 Subject: singularityce: fix after no spaces in Executable allowed (#39553) --- var/spack/repos/builtin/packages/singularityce/package.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'var') 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"] -- cgit v1.2.3-60-g2f50