diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 247705a956b..855e2d3f6d7 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -371,9 +371,7 @@ def _get_host_config_path(self, spec): # if on llnl systems, we can use the SYS_TYPE if "SYS_TYPE" in env: sys_type = env["SYS_TYPE"] - host_config_path = "{0}-{1}-{2}-ascent-{3}.cmake".format( - socket.gethostname(), sys_type, spec.compiler, spec.dag_hash() - ) + host_config_path = f"{socket.gethostname()}-{sys_type}-ascent-{spec.dag_hash()}.cmake" dest_dir = spec.prefix host_config_path = os.path.abspath(join_path(dest_dir, host_config_path)) return host_config_path diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 978298f597b..520e9a0ef30 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -304,9 +304,7 @@ def _get_host_config_path(self, spec): # if on llnl systems, we can use the SYS_TYPE if "SYS_TYPE" in env: sys_type = env["SYS_TYPE"] - host_config_path = "{0}-{1}-{2}-conduit-{3}.cmake".format( - socket.gethostname(), sys_type, spec.compiler, spec.dag_hash() - ) + host_config_path = f"{socket.gethostname()}-{sys_type}-conduit-{spec.dag_hash()}.cmake" dest_dir = self.stage.source_path host_config_path = os.path.abspath(join_path(dest_dir, host_config_path)) diff --git a/var/spack/repos/builtin/packages/lvarray/package.py b/var/spack/repos/builtin/packages/lvarray/package.py index 9fdb78ebabb..3b4df5e055c 100644 --- a/var/spack/repos/builtin/packages/lvarray/package.py +++ b/var/spack/repos/builtin/packages/lvarray/package.py @@ -122,12 +122,7 @@ def _get_host_config_path(self, spec): var = "-".join([var, "cuda"]) hostname = socket.gethostname().rstrip("1234567890") - host_config_path = "%s-%s-%s%s.cmake" % ( - hostname, - self._get_sys_type(spec), - spec.compiler, - var, - ) + host_config_path = f"{hostname}-{self._get_sys_type(spec)}-{var}.cmake" dest_dir = self.stage.source_path host_config_path = os.path.abspath(pjoin(dest_dir, host_config_path)) diff --git a/var/spack/repos/builtin/packages/vtk-h/package.py b/var/spack/repos/builtin/packages/vtk-h/package.py index 011e479ff16..62090a15fb5 100644 --- a/var/spack/repos/builtin/packages/vtk-h/package.py +++ b/var/spack/repos/builtin/packages/vtk-h/package.py @@ -115,9 +115,7 @@ def _get_host_config_path(self, spec): # if on llnl systems, we can use the SYS_TYPE if "SYS_TYPE" in env: sys_type = env["SYS_TYPE"] - host_config_path = "{0}-{1}-{2}-vtkh-{3}.cmake".format( - socket.gethostname(), sys_type, spec.compiler, spec.dag_hash() - ) + host_config_path = f"{socket.gethostname()}-{sys_type}-vtkh-{spec.dag_hash()}.cmake" dest_dir = spec.prefix host_config_path = os.path.abspath(join_path(dest_dir, host_config_path)) return host_config_path