summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-09-11 15:12:36 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-09-11 15:12:36 (GMT)
commit18608330df426ca8213be28cc1f221b275f3302b (patch)
tree97160f9c93560350d78a535cea3952aaf40a7067
parent7eb8cc2d54f435f6a5d52c089282fc46380c043a (diff)
downloadmorph-baserock/richardmaw/bugfix/branch-from-deployed-image.tar.gz
Fix `morph branch-from-image` to work for deployed imagesbaserock/richardmaw/bugfix/branch-from-deployed-image
It broke when we added /baserock/deployment.meta. We didn't notice this because our test suite was looking at the artifact produced by morph build, and listed on the terminal.
-rw-r--r--morphlib/plugins/branch_and_merge_plugin.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index a258cd7..d816fb9 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -636,7 +636,8 @@ class BranchAndMergePlugin(cliapp.Plugin):
system_metadatum = systems[0]
metadata_cache_id_lookup = dict((md['cache-key'], md)
- for md in metadata)
+ for md in metadata
+ if 'cache-key' in md)
return system_metadatum, metadata_cache_id_lookup