summaryrefslogtreecommitdiff
path: root/morphlib
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-08-08 15:16:20 (GMT)
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-08-14 13:28:50 (GMT)
commit43fb9e05c2a22c01c2d432af9500b531106eda8d (patch)
tree42e1aed14f2de71ec786717f0a7bb223a927f36f /morphlib
parent8c8ea75f681fa86d4c29a07419aae3bbcb3b8582 (diff)
downloadmorph-43fb9e05c2a22c01c2d432af9500b531106eda8d.tar.gz
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
Diffstat (limited to 'morphlib')
-rw-r--r--morphlib/cachekeycomputer.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py
index 7cbce73..588fc8d 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 = (