diff options
author | Richard Maw <richard.maw@gmail.com> | 2014-10-01 22:11:42 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@gmail.com> | 2014-10-08 12:13:56 +0000 |
commit | 2689f61a305ec576f229f1d9f0929d7eb11d1acc (patch) | |
tree | 85e4e0259360d8f824b1ee775f0511f939284d50 /distbuild/serialise.py | |
parent | f814cf6c4a8cae6b5a28349897626d42f5fd9f9e (diff) | |
download | morph-2689f61a305ec576f229f1d9f0929d7eb11d1acc.tar.gz |
Fix issues with distbuild caused by moving to building per-source
Diffstat (limited to 'distbuild/serialise.py')
-rw-r--r-- | distbuild/serialise.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/distbuild/serialise.py b/distbuild/serialise.py index 0a60b0c2..2b39000e 100644 --- a/distbuild/serialise.py +++ b/distbuild/serialise.py @@ -78,7 +78,8 @@ def serialise_artifact(artifact): for (_, sa) in a.source.artifacts.iteritems(): if id(sa) not in encoded_artifacts: encoded_artifacts[id(sa)] = encode_artifact(sa) - encoded_morphologies[id(a.source.morphology)] = encode_morphology(a.source.morphology) + encoded_morphologies[id(a.source.morphology)] = \ + encode_morphology(a.source.morphology) encoded_sources[id(a.source)] = encode_source(a.source) if id(a) not in encoded_artifacts: # pragma: no cover @@ -164,7 +165,10 @@ def deserialise_artifact(encoded): morphology = morphologies[source_dict['morphology']] kind = morphology['kind'] ruler = getattr(morphlib.artifactsplitrule, 'unify_%s_matches' % kind) - rules = ruler(morphology, le_dicts['default_split_rules'][kind]) + if kind in ('chunk', 'stratum'): + rules = ruler(morphology, le_dicts['default_split_rules'][kind]) + else: # pragma: no cover + rules = ruler(morphology) sources[source_id] = decode_source(source_dict, morphology, rules) # clear the source artifacts that get automatically generated |