Fix crash when listing latest backup

A one-element list containing "None" was emitted rather than an empty list. Fix this bug and insert some assertions to make such defects more perspicuous.
tsilen · Sep 8, 2013 · 716ae18 · 716ae18
1 parent 6625744
commit 716ae18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/wal_e/operator/s3_operator.py b/wal_e/operator/s3_operator.py
@@ -273,6 +273,8 @@ def database_s3_fetch(self, pg_cluster_dir, backup_name, pool_size):
 
         # There must be exactly one qualifying backup at this point.
         assert len(backups) == 1
+        assert backups[0] is not None
+
         backup_info = backups[0]
         layout.basebackup_tar_partition_directory(backup_info)
 

diff --git a/wal_e/worker/s3_worker.py b/wal_e/worker/s3_worker.py
@@ -540,7 +540,6 @@ def find_all(self, query):
             all_backups = list(iter(self))
 
             if not all_backups:
-                yield None
                 return
 
             assert len(all_backups) > 0