summaryrefslogtreecommitdiff
path: root/morphlib
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-12-07 16:06:42 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-12-07 16:06:42 +0000
commit1a570efbcd31678ce04c39c080b66735d05a2781 (patch)
treead6f64383f046e59a34a0b83c4f6039540c7247c /morphlib
parent94d3eb227bc367bd03053057c7e63e001886600f (diff)
parent36100edc77e8245b080343e12f59c26e35d66f2e (diff)
downloadmorph-1a570efbcd31678ce04c39c080b66735d05a2781.tar.gz
Merge branch 'jonathanmaw/cache-key-less-rigorous'
Diffstat (limited to 'morphlib')
-rw-r--r--morphlib/cachekeycomputer.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py
index a11334e3..a4ea10ed 100644
--- a/morphlib/cachekeycomputer.py
+++ b/morphlib/cachekeycomputer.py
@@ -91,6 +91,14 @@ class CacheKeyComputer(object):
elif kind in ('system', 'stratum'):
morphology = artifact.source.morphology
le_dict = dict((k, morphology[k]) for k in morphology.keys())
+
+ # Disregard all fields of a morphology that aren't important
+ ignored_fields = ('strata', 'build-depends', 'description',
+ 'chunks')
+ for ignored_field in ignored_fields:
+ if ignored_field in le_dict:
+ del le_dict[ignored_field]
+
checksum = hashlib.sha1()
self._hash_thing(checksum, le_dict)
keys['morphology-sha1'] = checksum.hexdigest()