Merge branch 'hotfix/0.2.1'

sebdah · Apr 28, 2014 · 1076056 · 1076056
2 parents 384e000 + 0cdd3c2
commit 1076056
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/automated_ebs_snapshots/settings.conf b/automated_ebs_snapshots/settings.conf
@@ -1,2 +1,2 @@
 [general]
-version: 0.2.0
+version: 0.2.1
diff --git a/automated_ebs_snapshots/snapshot_manager.py b/automated_ebs_snapshots/snapshot_manager.py
@@ -2,6 +2,8 @@
 import logging
 import datetime
 
+from boto.exception import EC2ResponseError
+
 from automated_ebs_snapshots import volume_manager
 from automated_ebs_snapshots.valid_intervals import VALID_INTERVALS
 
@@ -124,6 +126,10 @@ def _remove_old_snapshots(connection, volume):
 
     for snapshot in snapshots:
         logger.info('Deleting snapshot {}'.format(snapshot.id))
-        snapshot.delete()
+        try:
+            snapshot.delete()
+        except EC2ResponseError as error:
+            logger.warning('Could not remove snapshot: {}'.format(
+                error.message))
 
     logger.info('Done deleting snapshots')