X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fprocess_accepted.py;h=e597a8e23ac52524ce78f80ac1b68acc7aae2f74;hb=1483a68353fe374254379f4560cc245fbf2523d4;hp=683b1191ad6974ecbe72673ffeda85d6e5e5da88;hpb=74c5a1256401a709d74c496b972cc0bd38decaa8;p=dak.git diff --git a/dak/process_accepted.py b/dak/process_accepted.py index 683b1191..e597a8e2 100755 --- a/dak/process_accepted.py +++ b/dak/process_accepted.py @@ -30,7 +30,7 @@ ############################################################################### import errno, fcntl, os, sys, time, re -import apt_pkg +import apt_pkg, commands from daklib import database from daklib import logging from daklib import queue @@ -97,8 +97,10 @@ class Urgency_Log: else: os.unlink(self.log_filename) + ############################################################################### + def reject (str, prefix="Rejected: "): global reject_message if str: @@ -372,6 +374,10 @@ 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") + # If the .orig.tar.gz is in a legacy directory we need to poolify # it, so that apt-get source (and anything else that goes by the # "Directory:" field in the Sources.gz file) works. @@ -434,7 +440,6 @@ def install (): utils.copy(pkg.changes_file, Cnf["Dir::Root"] + dest) for dest in copy_dot_dak.keys(): utils.copy(Upload.pkg.changes_file[:-8]+".dak", dest) - projectB.query("COMMIT WORK") # Move the .changes into the 'done' directory