merge from master

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

diff --cc dak/process_accepted.py
index cc3f7eabdfe170ef1f4f7b19085144ac6d8ae2ed,71c0312afc450abd881d1f065764b05eed129cb8..d2b01c6441cbb22440b6836db285378160f3a675
--- 1/dak/process_accepted.py
--- 2/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@@ -379,9 -383,9 +390,12 @@@ 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("Missing contents for package")
 +
+     orig_tar_id = Upload.pkg.orig_tar_id
+     orig_tar_location = Upload.pkg.orig_tar_location
+ 
      # If this is a sourceful diff only upload that is moving
      # cross-component we need to copy the .orig.tar.gz into the new
      # component too for the same reasons as above.

diff --cc dak/process_unchecked.py
Simple merge

diff --cc daklib/utils.py
Simple merge