duplicity-team team mailing list archive

[Matthew Bentley <matthew@xxxxxxxxxxxx>]

Matthew Bentley has proposed merging lp:~matthew-t-bentley/duplicity/b2 into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~matthew-t-bentley/duplicity/b2/+merge/279958

Allow multiple backups in the same bucket

Fixes #1523498 as far as I can tell
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~matthew-t-bentley/duplicity/b2 into lp:duplicity.

=== modified file 'duplicity/backends/b2backend.py'
--- duplicity/backends/b2backend.py	2015-12-08 16:34:27 +0000
+++ duplicity/backends/b2backend.py	2015-12-08 23:31:47 +0000
@@ -131,7 +131,8 @@
         except urllib2.HTTPError:
             return []
 
-        files = [x['fileName'].split('/')[-1] for x in resp['files']]
+        files = [x['fileName'].split('/')[-1] for x in resp['files']
+                 if x['fileName'].startswith(self.path)]
 
         next_file = resp['nextFileName']
         while next_file:
@@ -141,7 +142,8 @@
             except urllib2.HTTPError:
                 return files
 
-            files += [x['fileName'].split('/')[-1] for x in resp['files']]
+            files += [x['fileName'].split('/')[-1] for x in resp['files']
+                      if x['fileName'].startswith(self.path)]
             next_file = resp['nextFileName']
 
         return files