From 18608330df426ca8213be28cc1f221b275f3302b Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Thu, 11 Sep 2014 16:12:36 +0100 Subject: Fix `morph branch-from-image` to work for deployed images 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. --- morphlib/plugins/branch_and_merge_plugin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index a258cd70..d816fb90 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 -- cgit v1.2.1