Merge lp:~mterry/duplicity/815635 into lp:duplicity/0.6

Proposed by Michael Terry
Status: Merged
Merged at revision: 764
Proposed branch: lp:~mterry/duplicity/815635
Merge into: lp:duplicity/0.6
Prerequisite: lp:~mterry/duplicity/more-accurate-sync
Diff against target: 22 lines (+5/-5)
1 file modified
duplicity-bin (+5/-5)
To merge this branch: bzr merge lp:~mterry/duplicity/815635
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+69148@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-bin'
2--- duplicity-bin 2011-07-25 19:02:54 +0000
3+++ duplicity-bin 2011-07-25 19:02:54 +0000
4@@ -939,13 +939,13 @@
5
6 fileobj = globals.backend.get_fileobj_read(fn)
7 src_iter = SrcIter(fileobj)
8+ tdp = dup_temp.new_tempduppath(file_naming.parse(loc_name))
9 if pr.manifest:
10- copy_raw(src_iter,
11- globals.archive_dir.append(loc_name).name)
12+ copy_raw(src_iter, tdp.name)
13 else:
14- gpg.GzipWriteFile(src_iter,
15- globals.archive_dir.append(loc_name).name,
16- size=sys.maxint)
17+ gpg.GzipWriteFile(src_iter, tdp.name, size=sys.maxint)
18+ tdp.setdata()
19+ tdp.move(globals.archive_dir.append(loc_name))
20
21 # get remote metafile list
22 remlist = globals.backend.list()

Subscribers

People subscribed via source and target branches

to all changes: