Pending merge

diff --git a/ChangeLog b/ChangeLog
index 90c033a7abb7aab6f9328f71be73ecca2e14b449..79a893b37b37fa98fb6524b185fca446ab8f4616 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-06  Joerg Jaspert  <joerg@debian.org>
+
+       * daklib/utils.py (check_signature): Make variable key available,
+       so we can access it.
+
 2008-01-07  Joerg Jaspert  <joerg@debian.org>
 
        * dak/examine_package.py (check_deb): Remove linda call. It

diff --git a/daklib/utils.py b/daklib/utils.py
index c6eeac2f22ba2c18df1eeb0f65c5669216839e1a..665d9928085372101de6c88490488a7513e2a275 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1009,6 +1009,9 @@ used."""
         reject("no signature found in %s." % (sig_filename))
         bad = 1
     if keywords.has_key("KEYEXPIRED") and not keywords.has_key("GOODSIG"):
+        args = keywords["KEYEXPIRED"]
+        if len(args) >= 1:
+            key = args[0]
         reject("The key (0x%s) used to sign %s has expired." % (key, sig_filename))
         bad = 1