X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=6a6c52d6e26dcdbddc93c64bd405527d38525a3d;hb=ff6cb3ebacee05d4ddc2dd0a0a734b8b92fa6de9;hp=6bbcf2dcc171e2ca99adb50991a13240b30a38d2;hpb=06b17e68fd4a76e7a12f741f26654e55bff05c79;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 6bbcf2dc..6a6c52d6 100644
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -946,7 +946,9 @@ def check_hashes ():
             fs = daklib.utils.build_file_list(changes, 0, "checksums-%s" % h, h)
             check_hash(".changes %s" % (h), fs, h, f, files)
         except daklib.utils.no_files_exc:
-            reject("No Checksums-%s: field in .changes file" % (h))
+            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
 
@@ -954,7 +956,9 @@ def check_hashes ():
             fs = daklib.utils.build_file_list(dsc, 1, "checksums-%s" % h, h)
             check_hash(".dsc %s" % (h), fs, h, f, dsc_files)
         except daklib.utils.no_files_exc:
-            reject("No Checksums-%s: field in .changes file" % (h))
+            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):