Merge lp:~mterry/duplicity/u1-ascii-error into lp:duplicity/0.6

Proposed by Michael Terry
Status: Merged
Merged at revision: 891
Proposed branch: lp:~mterry/duplicity/u1-ascii-error
Merge into: lp:duplicity/0.6
Diff against target: 12 lines (+1/-1)
1 file modified
duplicity/backends/u1backend.py (+1/-1)
To merge this branch: bzr merge lp:~mterry/duplicity/u1-ascii-error
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+132789@code.launchpad.net

Description of the change

From the mailing list. Patch by Paul Barker.

To post a comment you must log in.
Revision history for this message
Kenneth Loafman (kenneth-loafman) wrote :

Getting 'nothing to do' on this one when I try to merge it in.

Revision history for this message
Kenneth Loafman (kenneth-loafman) wrote :

Must have applied it in a previous merge. It's there.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity/backends/u1backend.py'
2--- duplicity/backends/u1backend.py 2012-10-27 12:16:19 +0000
3+++ duplicity/backends/u1backend.py 2012-11-03 21:39:23 +0000
4@@ -207,7 +207,7 @@
5 "Content-Type": content_type}
6 resp, content = self.client.request(remote_full,
7 method="PUT",
8- body=str(data),
9+ body=bytearray(data),
10 headers=headers)
11
12 def get(self, filename, local_path):

Subscribers

People subscribed via source and target branches

to all changes: