summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/spec.py43
1 files changed, 40 insertions, 3 deletions
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index 68394032d3..256e3edc83 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -1011,6 +1011,14 @@ class Spec(object):
self.external_modules = Spec._format_module_list(external_modules)
self._full_hash = full_hash
+ # Older spack versions did not compute full_hash or build_hash,
+ # and we may not have the necessary information to recompute them
+ # if we read in old specs. Old concrete specs are marked "final"
+ # when read in to indicate that we shouldn't recompute full_hash
+ # or build_hash. New specs are not final; we can lazily compute
+ # their hashes.
+ self._hashes_final = False
+
# This attribute is used to store custom information for
# external specs. None signal that it was not set yet.
self.extra_attributes = None
@@ -1650,10 +1658,33 @@ class Spec(object):
the hash_type, the build hash is also added. """
node = self.to_node_dict(hash)
node[self.name]['hash'] = self.dag_hash()
+
+ # full_hash and build_hash are lazily computed -- but if we write
+ # a spec out, we want them to be included. This is effectively
+ # the last chance we get to compute them accurately.
if self.concrete:
- node[self.name]['full_hash'] = self.full_hash()
- if 'build' in hash.deptype:
- node[self.name]['build_hash'] = self.build_hash()
+ # build and full hashes can be written out if:
+ # 1. they're precomputed (i.e. we read them from somewhere
+ # and they were already on the spec
+ # 2. we can still compute them lazily (i.e. we just made them and
+ # have the full dependency graph on-hand)
+ #
+ # we want to avoid recomputing either hash for specs we read
+ # in from the DB or elsewhere, as we may not have the info
+ # (like patches, package versions, etc.) that we need to
+ # compute them. Unknown hashes are better than wrong hashes.
+ write_full_hash = (
+ self._hashes_final and self._full_hash or # cached and final
+ not self._hashes_final) # lazily compute
+ write_build_hash = 'build' in hash.deptype and (
+ self._hashes_final and self._build_hash or # cached and final
+ not self._hashes_final) # lazily compute
+
+ if write_full_hash:
+ node[self.name]['full_hash'] = self.full_hash()
+ if write_build_hash:
+ node[self.name]['build_hash'] = self.build_hash()
+
return node
def to_record_dict(self):
@@ -1743,6 +1774,11 @@ class Spec(object):
# specs read in are concrete unless marked abstract
spec._concrete = node.get('concrete', True)
+ # this spec may have been built with older packages than we have
+ # on-hand, and we may not have the build dependencies, so mark it
+ # so we don't recompute full_hash and build_hash.
+ spec._hashes_final = spec._concrete
+
if 'patches' in node:
patches = node['patches']
if len(patches) > 0:
@@ -3176,6 +3212,7 @@ class Spec(object):
self._dup_deps(other, deptypes, caches)
self._concrete = other._concrete
+ self._hashes_final = other._hashes_final
if caches:
self._hash = other._hash