Merge commit 'stew/content_generation' into merge

* commit 'stew/content_generation':
  fail on first error in valid_deb
  full path to deb to copy_pending_contents

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index c30e9c4999dfb681b6068c62c4b6570058914bad..64679c13586acbddbb725895fe228bbb5329e9da 100755 (executable)
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -390,7 +390,7 @@ def install ():
                 suite_id = database.get_suite_id(suite)
                 projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%d, currval('binaries_id_seq'))" % (suite_id))
 
-            if not database.copy_temporary_contents(package, version, files[newfile], reject):
+            if not database.copy_temporary_contents(package, version, filename, reject):
                 reject("Missing contents for package")
 
     orig_tar_id = Upload.pkg.orig_tar_id

diff --git a/daklib/binary.py b/daklib/binary.py
index 484c68c345efa90117a3caa760a4f459329a5cd9..a079763b45dc63b0d52ac71aff38c26ca7eed82b 100755 (executable)
--- 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]))