# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1147173976 -7200
# Node ID 9a2f4b2e7cf1c705e58d60dc21a6ca8b895dd18b
# Parent  33295034078849ba60c7b4422b69fbc63704c3f2
gpg extension: Always remove temporary files created by 'hg sigcheck'.


diff -r 332950340788 -r 9a2f4b2e7cf1 hgext/gpg.py
--- a/hgext/gpg.py	Mon May 08 16:50:27 2006 -0700
+++ b/hgext/gpg.py	Tue May 09 13:26:16 2006 +0200
@@ -21,6 +21,7 @@
 
     def verify(self, data, sig):
         """ returns of the good and bad signatures"""
+        sigfile = datafile = None
         try:
             # create temporary files
             fd, sigfile = tempfile.mkstemp(prefix="hg-gpg-", suffix=".sig")
@@ -34,12 +35,11 @@
             gpgcmd = ("%s --logger-fd 1 --status-fd 1 --verify "
                       "\"%s\" \"%s\"" % (self.path, sigfile, datafile))
             ret = util.filter("", gpgcmd)
-        except:
+        finally:
             for f in (sigfile, datafile):
                 try:
                     if f: os.unlink(f)
                 except: pass
-            raise
         keys = []
         key, fingerprint = None, None
         err = ""