From e1946fcb685986c9482066cfea321740e72ff023 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Thu, 15 Jan 2015 22:44:55 +0100 Subject: [PATCH] Simpler check for whether to create image or use image in prebootstrapped plugin --- bootstrapvz/plugins/prebootstrapped/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrapvz/plugins/prebootstrapped/__init__.py b/bootstrapvz/plugins/prebootstrapped/__init__.py index bcdc4fc..614e049 100644 --- a/bootstrapvz/plugins/prebootstrapped/__init__.py +++ b/bootstrapvz/plugins/prebootstrapped/__init__.py @@ -37,13 +37,13 @@ def resolve_tasks(taskset, manifest): guest_additions.InstallGuestAdditions, ] if manifest.volume['backing'] == 'ebs': - if 'snapshot' in settings and settings['snapshot'] is not None: + if settings.get('snapshot', None) is not None: taskset.add(CreateFromSnapshot) [taskset.discard(task) for task in skip_tasks] else: taskset.add(Snapshot) else: - if 'image' in settings and settings['image'] is not None: + if settings.get('image', None) is not None: taskset.add(CreateFromImage) [taskset.discard(task) for task in skip_tasks] else: