diff options
Diffstat (limited to 'var')
3 files changed, 5 insertions, 5 deletions
diff --git a/var/spack/repos/builtin.mock/packages/find-externals1/package.py b/var/spack/repos/builtin.mock/packages/find-externals1/package.py index 07d16a8f22..b8adbac19c 100644 --- a/var/spack/repos/builtin.mock/packages/find-externals1/package.py +++ b/var/spack/repos/builtin.mock/packages/find-externals1/package.py @@ -32,4 +32,4 @@ class FindExternals1(AutotoolsPackage): match = re.search(r"find-externals1.*version\s+(\S+)", output) if match: version_str = match.group(1) - return Spec.from_detection("find-externals1@{0}".format(version_str)) + return Spec.from_detection(f"find-externals1@{version_str}", external_path=prefix) diff --git a/var/spack/repos/builtin/packages/lhapdfsets/package.py b/var/spack/repos/builtin/packages/lhapdfsets/package.py index deb654c067..2dbe00a9a9 100644 --- a/var/spack/repos/builtin/packages/lhapdfsets/package.py +++ b/var/spack/repos/builtin/packages/lhapdfsets/package.py @@ -74,8 +74,8 @@ class Lhapdfsets(BundlePackage): @classmethod def determine_spec_details(cls, prefix, exes_in_prefix): path = os.environ.get("LHAPDF_DATA_PATH", None) + if not path: + return None # unfortunately the sets are not versioned - # just hardcode the current version and hope it is fine - s = Spec.from_detection("lhapdfsets@6.3.0") - s.external_path = path - return s if path else None + return Spec.from_detection("lhapdfsets@6.3.0", external_path=path) diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index 230d64ca05..b715573f1c 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -113,7 +113,7 @@ class Rust(Package): match = re.match(r"rustc (\S+)", output) if match: version_str = match.group(1) - return Spec.from_detection(f"rust@{version_str}") + return Spec.from_detection(f"rust@{version_str}", external_path=prefix) def setup_dependent_package(self, module, dependent_spec): module.cargo = Executable(os.path.join(self.spec.prefix.bin, "cargo")) |