From 880eb36a1f3515ab950d2bdb3e79a8fa74112b19 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 2 Jan 2025 21:45:26 +0100 Subject: [PATCH] charliecloud: disable libsquashfuse when ~squashfuse (#48317) --- .../repos/builtin/packages/charliecloud/package.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index c2d10c28874..adcb7ce6efb 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -157,20 +157,19 @@ def autoreconf(self, spec, prefix): which("bash")("autogen.sh") def configure_args(self): - args = [] - py_path = self.spec["python"].command.path - args.append("--with-python={0}".format(py_path)) + args = [f"--with-python={self.spec['python'].command.path}"] if self.spec.satisfies("+docs"): - sphinx_bin = "{0}".format(self.spec["py-sphinx"].prefix.bin) + sphinx_bin = f"{self.spec['py-sphinx'].prefix.bin}" args.append("--enable-html") - args.append("--with-sphinx-build={0}".format(sphinx_bin.join("sphinx-build"))) + args.append(f"--with-sphinx-build={sphinx_bin.join('sphinx-build')}") else: args.append("--disable-html") if self.spec.satisfies("+squashfuse"): - squashfuse_prefix = "{0}".format(self.spec["squashfuse"].prefix) - args.append("--with-libsquashfuse={0}".format(squashfuse_prefix)) + args.append(f"--with-libsquashfuse={self.spec['squashfuse'].prefix}") + else: + args.append("--with-libsquashfuse=no") return args