Duplicity

Merge lp:~germar/duplicity/par2removefix into lp:~duplicity-team/duplicity/0.7-series

  1. par2removefix
  2. Merge into 0.7-series
Proposed by Germar
Status: Merged
Merged at revision: 1125
Proposed branch: lp:~germar/duplicity/par2removefix
Merge into: lp:~duplicity-team/duplicity/0.7-series
Diff against target: 32 lines (+6/-3)
1 file modified
duplicity/backends/par2backend.py (+6/-3)
To merge this branch: bzr merge lp:~germar/duplicity/par2removefix
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+268984@code.launchpad.net

Description of the change

After reorganisation in revision 981 and the fix for bug #1406173 the par2backend does not remove .par2 files anymore when removing duplicity-*.gpg files.

This banch will add an unfiltered_list() method which will be used in delete() and delete_list()

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'duplicity/backends/par2backend.py'
--- duplicity/backends/par2backend.py 2015-06-16 14:02:08 +0000
+++ duplicity/backends/par2backend.py 2015-08-24 22:19:14 +0000
@@ -144,8 +144,8 @@
144 """144 """
145 self.wrapped_backend._delete(filename)145 self.wrapped_backend._delete(filename)
146146
147 remote_list = self.list()147 remote_list = self.unfiltered_list()
148 filename_list = [filename]148
149 c = re.compile(r'%s(?:\.vol[\d+]*)?\.par2' % filename)149 c = re.compile(r'%s(?:\.vol[\d+]*)?\.par2' % filename)
150 for remote_filename in remote_list:150 for remote_filename in remote_list:
151 if c.match(remote_filename):151 if c.match(remote_filename):
@@ -154,7 +154,7 @@
154 def delete_list(self, filename_list):154 def delete_list(self, filename_list):
155 """delete given filename_list and all .par2 files that belong to them155 """delete given filename_list and all .par2 files that belong to them
156 """156 """
157 remote_list = self.list()157 remote_list = self.unfiltered_list()
158158
159 for filename in filename_list[:]:159 for filename in filename_list[:]:
160 c = re.compile(r'%s(?:\.vol[\d+]*)?\.par2' % filename)160 c = re.compile(r'%s(?:\.vol[\d+]*)?\.par2' % filename)
@@ -179,6 +179,9 @@
179 filtered_list.append(filename)179 filtered_list.append(filename)
180 return filtered_list180 return filtered_list
181181
182 def unfiltered_list(self):
183 return self.wrapped_backend._list()
184
182 def retry_cleanup(self):185 def retry_cleanup(self):
183 self.wrapped_backend._retry_cleanup()186 self.wrapped_backend._retry_cleanup()
184187

Subscribers

People subscribed via source and target branches