Merge lp:~ed.so/duplicity/gpg.tmp into lp:duplicity/0.6

[edso]

place gpg.py tempfiles in duplicity's tmp subfolder which is cleaned whatever happens

=== modified file 'duplicity/gpg.py'
--- duplicity/gpg.py	2012-05-15 11:34:57 +0000
+++ duplicity/gpg.py	2012-10-07 12:26:22 +0000
@@ -28,6 +28,7 @@
 from duplicity import misc
 from duplicity import globals
 from duplicity import GnuPGInterface
+from duplicity import tempdir
 
 try:
     from hashlib import sha1
@@ -93,8 +94,8 @@
         """
         self.status_fp = None # used to find signature
         self.closed = None # set to true after file closed
-        self.logger_fp = tempfile.TemporaryFile()
-        self.stderr_fp = tempfile.TemporaryFile()
+        self.logger_fp = tempfile.TemporaryFile( dir=tempdir.default().dir() )
+        self.stderr_fp = tempfile.TemporaryFile( dir=tempdir.default().dir() )
         self.name = encrypt_path
         self.byte_count = 0
 
@@ -149,7 +150,7 @@
             if profile.recipients and profile.encrypt_secring:
                 cmdlist.append('--secret-keyring')
                 cmdlist.append(profile.encrypt_secring)
-            self.status_fp = tempfile.TemporaryFile()
+            self.status_fp = tempfile.TemporaryFile( dir=tempdir.default().dir() )
             # Skip the passphrase if using the agent
             if globals.use_agent:
                 gnupg_fhs = ['stdout',]