Duplicity

Merge lp:~ed.so/duplicity/webdav200fix-0.7 into lp:~duplicity-team/duplicity/0.7-series

  1. webdav200fix-0.7
  2. Merge into 0.7-series
Proposed by edso
Status: Merged
Merged at revision: 991
Proposed branch: lp:~ed.so/duplicity/webdav200fix-0.7
Merge into: lp:~duplicity-team/duplicity/0.7-series
Diff against target: 13 lines (+2/-1)
1 file modified
duplicity/backends/webdavbackend.py (+2/-1)
To merge this branch: bzr merge lp:~ed.so/duplicity/webdav200fix-0.7
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+223153@code.launchpad.net
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
1=== modified file 'duplicity/backends/webdavbackend.py'
2--- duplicity/backends/webdavbackend.py 2014-05-07 21:41:31 +0000
3+++ duplicity/backends/webdavbackend.py 2014-06-14 13:45:06 +0000
4@@ -391,7 +391,8 @@
5 try:
6 source_file = source_path.open("rb")
7 response = self.request("PUT", url, source_file.read())
8- if response.status in [201, 204]:
9+ # 200 is returned if a file is overwritten during restarting
10+ if response.status in [200, 201, 204]:
11 response.read()
12 response.close()
13 else:

Subscribers

People subscribed via source and target branches