From 4124c50b8dc3dfb0ffb933153d0fe6385edf389c Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Fri, 1 Aug 2014 09:59:43 +0000 Subject: Ensure that none of the _orig_* fields are in the cache key morph2.Morphology adds a number of fields beginning with _orig_, which contain default values. There is no reason for these values to be in the cache key, and this fixes a bug where distbuild created systems with a different cache key than local builds did when the configuration extensions list was empty. --- morphlib/cachekeycomputer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'morphlib') diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 292047c8..73cc75f3 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -122,7 +122,8 @@ class CacheKeyComputer(object): # products is omitted as they are part of the split-rules elif kind in ('system', 'stratum'): morphology = artifact.source.morphology - morph_dict = dict((k, morphology[k]) for k in morphology.keys()) + morph_dict = dict((k, morphology[k]) for k in morphology.keys() + if not k.startswith('_orig_')) # Disregard all fields of a morphology that aren't important ignored_fields = ( -- cgit v1.2.1