diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-09-12 11:55:43 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-09-12 11:55:43 +0000 |
| commit | 368ac1d818b1f06b433a4367e76c366b410468cc (patch) | |
| tree | 97160f9c93560350d78a535cea3952aaf40a7067 | |
| parent | 7eb8cc2d54f435f6a5d52c089282fc46380c043a (diff) | |
| parent | 18608330df426ca8213be28cc1f221b275f3302b (diff) | |
| download | morph-368ac1d818b1f06b433a4367e76c366b410468cc.tar.gz | |
Merge remote-tracking branch 'origin/baserock/richardmaw/bugfix/branch-from-deployed-image'
Reviewed-by: Pedro Alvarez
Reviewed-by: Sam Thursfield
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 3 |
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 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 |