Merge lp:~ed.so/duplicity/duplicity.tmpspacefix into lp:duplicity/0.6

[edso]

probably solves bug 'Out of space error while restoring a file' due to creating restored files always in /tmp
see bug tracker/mailing list
 https://bugs.launchpad.net/duplicity/+bug/1005901
 http://lists.gnu.org/archive/html/duplicity-talk/2012-09/msg00000.html

[lp:~ed.so/duplicity/duplicity.tmpspacefix]

860. By edso on 2012-09-11

use tempfile.TemporaryFile() so unused temp files are deleted automagically

=== modified file 'duplicity/patchdir.py'
--- duplicity/patchdir.py	2011-08-23 18:14:17 +0000
+++ duplicity/patchdir.py	2012-09-11 14:13:22 +0000
@@ -21,8 +21,8 @@
 
 import re #@UnusedImport
 import types
+import os
 import tempfile
-import os
 
 from duplicity import tarfile #@UnusedImport
 from duplicity import librsync #@UnusedImport
@@ -30,6 +30,7 @@
 from duplicity import diffdir
 from duplicity import misc
 from duplicity import selection
+from duplicity import tempdir
 from duplicity import util #@UnusedImport
 from duplicity.path import * #@UnusedWildImport
 from duplicity.lazy import * #@UnusedWildImport
@@ -470,8 +471,11 @@
     for delta_ropath in patch_seq[1:]:
         assert delta_ropath.difftype == "diff", delta_ropath.difftype
         if not isinstance( current_file, file ):
-            # librsync needs true file
-            tempfp = os.tmpfile()
+            """
+            librsync insists on a real file object, which we create manually
+            by using the duplicity.tempdir to tell us where.
+            """
+            tempfp = tempfile.TemporaryFile( dir=tempdir.default().dir() )
             misc.copyfileobj( current_file, tempfp )
             assert not current_file.close()
             tempfp.seek( 0 )
 
=== modified file 'duplicity/tempdir.py'
--- duplicity/tempdir.py	2011-08-18 19:17:55 +0000
+++ duplicity/tempdir.py	2012-09-11 14:13:22 +0000
@@ -127,6 +127,12 @@
 
         self.__lock = threading.Lock()  # protect private resources *AND* mktemp/mkstemp calls
 
+    def dir(self):
+    	"""
+    	Returns the absolute pathname of the temp folder.
+    	"""
+        return self.__dir 
+
     def __del__(self):
         """
         Perform cleanup.