From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 3 May 2008 09:07:16 +0000 (+0200)
Subject: Merge Thomas fix for check_hashes
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d2e5e2795699bcdfff166b4948a61a1944abc8b3;hp=3a1138daaa477085ebd0940ecd5649409b25e205;p=dak.git

Merge Thomas fix for check_hashes
---

diff --git a/ChangeLog b/ChangeLog
index 12ad5189..fc6e9f88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-03  Thomas Viehmann  <tv@beamnet.de>
+
+	* dak/process_unchecked.py (check_hashes): Reject on error while
+	parsing Checksums-*.
+
 2008-05-02  Joerg Jaspert  <joerg@debian.org>
 
 	* config/debian/pseudo-packages*: Removed listarchives, closes #468667
diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 8bfc25ce..abf53fd1 100644
--- 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))
 
 ################################################################################