cater for uid_email None in sponsor notification

[dak.git] / dak / process_unchecked.py

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 8bfc25cee1f9f6203e804af39c7ed8aa1180c582..6a6c52d6e26dcdbddc93c64bd405527d38525a3d 100644 (file)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -947,6 +947,8 @@ def check_hashes ():
             check_hash(".changes %s" % (h), fs, h, f, files)
         except daklib.utils.no_files_exc:
             reject("No Checksums-%s: field in .changes" % (h))
+        except daklib.utils.changes_parse_error_exc, line:
+            reject("parse error for Checksums-%s in .changes, can't grok: %s." % (h, line))
 
         if "source" not in changes["architecture"]: continue
 
@@ -955,6 +957,8 @@ def check_hashes ():
             check_hash(".dsc %s" % (h), fs, h, f, dsc_files)
         except daklib.utils.no_files_exc:
             reject("No Checksums-%s: field in .dsc" % (h))
+        except daklib.utils.changes_parse_error_exc, line:
+            reject("parse error for Checksums-%s in .dsc, can't grok: %s." % (h, line))
 
 ################################################################################
 
@@ -1086,7 +1090,7 @@ def check_signed_by_key():
     else:
         sponsored = 1
         if ("source" in changes["architecture"] and
-            daklib.utils.is_email_alias(uid_email)):
+            uid_email and daklib.utils.is_email_alias(uid_email)):
             sponsor_addresses = daklib.utils.gpg_get_key_addresses(changes["fingerprint"])
             if (changes["maintaineremail"] not in sponsor_addresses and
                 changes["changedbyemail"] not in sponsor_addresses):