X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_accepted.py;h=71c0312afc450abd881d1f065764b05eed129cb8;hb=aa63ea6814c83460abc4417f52ffdf5232431dd6;hp=d2b01c6441cbb22440b6836db285378160f3a675;hpb=8c5aeba3e18751fd6a09d62e9c7bcf7bd56fd881;p=dak.git diff --git a/dak/process_accepted.py b/dak/process_accepted.py index d2b01c64..71c0312a 100755 --- a/dak/process_accepted.py +++ b/dak/process_accepted.py @@ -29,13 +29,8 @@ ############################################################################### -import errno -import fcntl -import os -import sys -import time -import re -import apt_pkg, commands +import errno, fcntl, os, sys, time, re +import apt_pkg from daklib import database from daklib import logging from daklib import queue @@ -102,10 +97,8 @@ class Urgency_Log: else: os.unlink(self.log_filename) - ############################################################################### - def reject (str, prefix="Rejected: "): global reject_message if str: @@ -390,9 +383,6 @@ 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 @@ -436,6 +426,7 @@ 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