duplicity-team team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/duplicity/815635 into lp:duplicity with lp:~mterry/duplicity/more-accurate-sync as a prerequisite.

Requested reviews:
  duplicity-team (duplicity-team)
Related bugs:
  Bug #815635 in Duplicity: "Bad passphrase can leave bogus sigtar in archive"
  https://bugs.launchpad.net/duplicity/+bug/815635

For more details, see:
https://code.launchpad.net/~mterry/duplicity/815635/+merge/69148
-- 
https://code.launchpad.net/~mterry/duplicity/815635/+merge/69148
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/815635 into lp:duplicity.

=== modified file 'duplicity-bin'
--- duplicity-bin	2011-07-25 19:02:54 +0000
+++ duplicity-bin	2011-07-25 19:02:54 +0000
@@ -939,13 +939,13 @@
 
         fileobj = globals.backend.get_fileobj_read(fn)
         src_iter = SrcIter(fileobj)
+        tdp = dup_temp.new_tempduppath(file_naming.parse(loc_name))
         if pr.manifest:
-            copy_raw(src_iter,
-                     globals.archive_dir.append(loc_name).name)
+            copy_raw(src_iter, tdp.name)
         else:
-            gpg.GzipWriteFile(src_iter,
-                              globals.archive_dir.append(loc_name).name,
-                              size=sys.maxint)
+            gpg.GzipWriteFile(src_iter, tdp.name, size=sys.maxint)
+        tdp.setdata()
+        tdp.move(globals.archive_dir.append(loc_name))
 
     # get remote metafile list
     remlist = globals.backend.list()