duplicity-team team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/duplicity/818178 into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)
Related bugs:
  Bug #818178 in Duplicity: "Shouldn't try to delete files it knows don't exist"
  https://bugs.launchpad.net/duplicity/+bug/818178

For more details, see:
https://code.launchpad.net/~mterry/duplicity/818178/+merge/69845

See bug 818178 for rationale.
-- 
https://code.launchpad.net/~mterry/duplicity/818178/+merge/69845
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/818178 into lp:duplicity.

=== modified file 'duplicity/collections.py'
--- duplicity/collections.py	2011-07-22 17:33:50 +0000
+++ duplicity/collections.py	2011-07-29 18:09:24 +0000
@@ -247,9 +247,14 @@
         volume_filenames = map(lambda x: self.volume_name_dict[x],
                                volume_num_list)
         if self.remote_manifest_name:
-            return [self.remote_manifest_name] + volume_filenames
-        else:
-            return volume_filenames
+            # For convenience of implementation for restart support, we treat
+            # local partial manifests as this set's remote manifest.  But
+            # when specifically asked for a list of remote filenames, we
+            # should not include it.
+            pr = file_naming.parse(self.remote_manifest_name)
+            if not pr or not pr.partial:
+                volume_filenames.append(self.remote_manifest_name)
+        return volume_filenames
 
     def get_time(self):
         """