From: Mike O'Connor <stew@vireo.org>
Date: Sun, 22 Feb 2009 13:13:39 +0000 (-0500)
Subject: merge from master
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=603d8ace7d4f942c999c29556bde38ec2516b9a8

merge from master

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

603d8ace7d4f942c999c29556bde38ec2516b9a8
diff --cc dak/process_accepted.py
index cc3f7eab,71c0312a..d2b01c64
--- a/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.