From 43fb9e05c2a22c01c2d432af9500b531106eda8d Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Fri, 8 Aug 2014 15:16:20 +0000 Subject: Revert "Ensure that none of the _orig_* fields are in the cache key" This reverts commit 4124c50b8dc3dfb0ffb933153d0fe6385edf389c. This commit is no longer needed now that morph2 is gone. Conflicts: morphlib/cachekeycomputer.py --- morphlib/cachekeycomputer.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'morphlib') diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 7cbce730..588fc8d3 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -122,10 +122,7 @@ class CacheKeyComputer(object): # products is omitted as they are part of the split-rules elif kind in ('system', 'stratum'): morphology = artifact.source.morphology - # 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_')) + morph_dict = dict((k, morphology[k]) for k in morphology.keys()) # Disregard all fields of a morphology that aren't important ignored_fields = ( -- cgit v1.2.1