[Treepkg-commits] r114 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: bh
Date: 2008-07-08 17:39:34 +0200 (Tue, 08 Jul 2008)
New Revision: 114

Modified:
   trunk/treepkg/builder.py
Log:
When signing Release files, delete the signature before creating a new
one to avoid gpg asking whether to overwrite the signature file.


Modified: trunk/treepkg/builder.py
===================================================================
--- trunk/treepkg/builder.py	2008-06-26 16:48:20 UTC (rev 113)
+++ trunk/treepkg/builder.py	2008-07-08 15:39:34 UTC (rev 114)
@@ -111,6 +111,13 @@
         release_filename = os.path.join(self.extra_pkg_dir, "Release")
         run.call(cmdexpand("apt-ftparchive release ."),
                  stdout=open(release_filename, "w"), cwd=self.extra_pkg_dir)
+        # handle signatures.  remove any existing signature because it
+        # will be invalid now.
+        signature = release_filename + ".gpg"
+        try:
+            os.remove(signature)
+        except OSError:
+            pass
         if self.release_signing_keyid:
             run.call(cmdexpand("gpg --detach-sign --armor --local-user=$keyid"
                                " -o $sig $release",