ftpmaster-dak r1071: Merge Thomas fix for check_hashes
------------------------------------------------------------
revno: 1071
committer: Joerg Jaspert <joerg@debian.org>
branch nick: upstream
timestamp: Sat 2008-05-03 11:07:16 +0200
message:
Merge Thomas fix for check_hashes
modified:
ChangeLog
dak/process_unchecked.py
------------------------------------------------------------
revno: 1070.1.1
committer: Thomas Viehmann <tv@beamnet.de>
branch nick: broken-changes-reject
timestamp: Sat 2008-05-03 07:04:31 +0000
message:
reject on syntax error in Checksum-* filelist
modified:
ChangeLog
dak/process_unchecked.py
=== modified file 'ChangeLog'
--- a/ChangeLog 2008-05-02 21:48:18 +0000
+++ b/ChangeLog 2008-05-03 07:04:31 +0000
@@ -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
=== modified file 'dak/process_unchecked.py'
--- a/dak/process_unchecked.py 2008-05-02 15:49:25 +0000
+++ b/dak/process_unchecked.py 2008-05-03 07:04:31 +0000
@@ -947,6 +947,8 @@
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 @@
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))
################################################################################
Reply to: