zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failurs with reuse and git ref specs

Browse Source
This commit is contained in:
psakievich
2024-04-25 21:50:21 -06:00
committed by GitHub
parent 2bf900a893
commit 1835d79797
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/spack/spack/solver/asp.py
View File

@@ -2390,6 +2390,11 @@ def setup(
self.gen.h1("Reusable concrete specs") self.gen.h1("Reusable concrete specs")
self.define_concrete_input_specs(specs, self.pkgs) self.define_concrete_input_specs(specs, self.pkgs)
# TODO: make a config option for this undocumented feature
checksummed = "SPACK_CONCRETIZER_REQUIRE_CHECKSUM" in os.environ
self.define_ad_hoc_versions_from_specs(
specs, Provenance.SPEC, allow_deprecated=allow_deprecated, require_checksum=checksummed
)
if reuse: if reuse:
self.gen.fact(fn.optimize_for_reuse()) self.gen.fact(fn.optimize_for_reuse())
for reusable_spec in reuse: for reusable_spec in reuse:
@@ -2421,14 +2426,9 @@ def setup(
self.provider_requirements() self.provider_requirements()
self.external_packages() self.external_packages()
# TODO: make a config option for this undocumented feature
checksummed = "SPACK_CONCRETIZER_REQUIRE_CHECKSUM" in os.environ
self.define_package_versions_and_validate_preferences( self.define_package_versions_and_validate_preferences(
self.pkgs, allow_deprecated=allow_deprecated, require_checksum=checksummed self.pkgs, allow_deprecated=allow_deprecated, require_checksum=checksummed
) )
self.define_ad_hoc_versions_from_specs(
specs, Provenance.SPEC, allow_deprecated=allow_deprecated, require_checksum=checksummed
)
self.define_ad_hoc_versions_from_specs( self.define_ad_hoc_versions_from_specs(
dev_specs, dev_specs,
Provenance.DEV_SPEC, Provenance.DEV_SPEC,