From 1835d79797ea754e5d0364c7facc65875f053def Mon Sep 17 00:00:00 2001 From: psakievich Date: Thu, 25 Apr 2024 21:50:21 -0600 Subject: [PATCH] Fix failurs with reuse and git ref specs --- lib/spack/spack/solver/asp.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index 2b86200a309..180b3e83370 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -2390,6 +2390,11 @@ def setup( self.gen.h1("Reusable concrete specs") 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: self.gen.fact(fn.optimize_for_reuse()) for reusable_spec in reuse: @@ -2421,14 +2426,9 @@ def setup( self.provider_requirements() 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.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( dev_specs, Provenance.DEV_SPEC,