Merge from Thomas

diff --git a/ChangeLog b/ChangeLog
index ab1a70a68199360ed27b534bdbd6661ea971d809..eead3da3bcfc0b541efd1535f06d6401b3c600c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,11 @@
        long-time unused and commented code. Import stuff from daklib as
        "import daklib.foo as foo"
 
+2008-05-04  Thomas Viehmann  <tv@beamnet.de>
+
+       * dak/process_unchecked.py (check_signed_by_key): cater for uid_email
+       None in sponsor notification
+
 2008-05-03  Joerg Jaspert  <joerg@debian.org>
 
        * dak/examine_package.py: clean up pychecker warnings (merged with

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 15aea62e54fbba80a0d65bf19b378145bc6e1618..fbd7d74d20dd0aec12dc3a36d91b0554c7b2546b 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -1090,7 +1090,7 @@ def check_signed_by_key():
     else:
         sponsored = 1
         if ("source" in changes["architecture"] and
-            utils.is_email_alias(uid_email)):
+            uid_email and utils.is_email_alias(uid_email)):
             sponsor_addresses = utils.gpg_get_key_addresses(changes["fingerprint"])
             if (changes["maintaineremail"] not in sponsor_addresses and
                 changes["changedbyemail"] not in sponsor_addresses):