From: Mike O'Connor <stew@vireo.org>
Date: Fri, 13 Mar 2009 16:38:05 +0000 (-0400)
Subject: fail on first error in valid_deb
X-Git-Tag: debian-r/squeeze~1241^2~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0d010f52896222de24d4403f37829ba73db8db90;p=dak.git

fail on first error in valid_deb

Signed-off-by: Mike O'Connor <stew@vireo.org>
---

diff --git a/daklib/binary.py b/daklib/binary.py
index 484c68c3..a079763b 100755
--- a/daklib/binary.py
+++ b/daklib/binary.py
@@ -142,10 +142,10 @@ class Binary(object):
         if self.chunks[0] != "debian-binary":
             rejected = True
             self.reject("%s: first chunk is '%s', expected 'debian-binary'." % (self.filename, self.chunks[0]))
-        if self.chunks[1] != "control.tar.gz":
+        if not rejected and self.chunks[1] != "control.tar.gz":
             rejected = True
             self.reject("%s: second chunk is '%s', expected 'control.tar.gz'." % (self.filename, self.chunks[1]))
-        if self.chunks[2] not in [ "data.tar.bz2", "data.tar.gz" ]:
+        if not rejected and self.chunks[2] not in [ "data.tar.bz2", "data.tar.gz" ]:
             rejected = True
             self.reject("%s: third chunk is '%s', expected 'data.tar.gz' or 'data.tar.bz2'." % (self.filename, self.chunks[2]))