Merge commit 'ftpmaster/master'

[dak.git] / dak / process_accepted.py

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index 64679c13586acbddbb725895fe228bbb5329e9da..97c5d0d512d5f0c9e692a0fee54abd587d350e97 100755 (executable)
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -390,8 +390,11 @@ 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, filename, reject):
-                reject("Missing contents for package")
+            if not database.copy_temporary_contents(package, version, newfile, reject):
+                print "REJECT\n" + reject_message,
+                projectB.query("ROLLBACK")
+                raise MissingContents, "No contents stored for package %s, and couldn't determine contents of %s" % (package, newfile )
+
 
     orig_tar_id = Upload.pkg.orig_tar_id
     orig_tar_location = Upload.pkg.orig_tar_location