Merge cb5e8e7 into 1e239c9

wnkz · Nov 14, 2017 · 5191b38 · 5191b38
2 parents 1e239c9 + cb5e8e7
commit 5191b38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -87,3 +87,5 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+.vscode
diff --git a/shipami/core.py b/shipami/core.py
@@ -306,7 +306,10 @@ def __get_image_snapshots(self, image):
         self.__wait_for_image(image)
         for block_device_mapping in image.block_device_mappings:
             if block_device_mapping.get('Ebs'):
-                snapshots.append(ec2.Snapshot(block_device_mapping['Ebs']['SnapshotId']))
+                try:
+                    snapshots.append(ec2.Snapshot(block_device_mapping['Ebs']['SnapshotId']))
+                except KeyError:
+                    pass
         return snapshots
 
     def __get_image_block_devices(self, image):