diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-01 15:47:42 +0100 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-01 15:51:31 +0100 |
| commit | 1a6fb660b94228745efc4543138b9dc1fa50e912 (patch) | |
| tree | 52de8380186e5e5d58e72b90be5fb30809a50210 | |
| parent | ae84534592b7f74cc630189fe3254c36b99b0c8d (diff) | |
| parent | 4124c50b8dc3dfb0ffb933153d0fe6385edf389c (diff) | |
| download | morph-1a6fb660b94228745efc4543138b9dc1fa50e912.tar.gz | |
Merge branch 'baserock/adamcoldrick/no-orig-fields-in-cache-key'
This fixes a bug where distbuild was calculating a different cache
local build. It will no longer be needed once morph2 is removed.
Reviewed-by: Sam Thursfield
Reviewed-by: Richard Maw
| -rw-r--r-- | morphlib/cachekeycomputer.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 292047c8..b124b789 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -122,7 +122,10 @@ 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()) + # Exclude fields starting with _orig_. This filtering can be + # removed once the morph2 code is gone. + 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 = ( |