X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_accepted.py;h=94c2ea3074980e540f4b4adf0058fc787dc8c1f5;hb=68e191dfee7b1a40bfbae5d525f9ff2187459e6c;hp=605b5c23228eb998412db514a45eabed3bffd7c1;hpb=020f423243aaeab5ede2313b274131067386213f;p=dak.git diff --git a/dak/process_accepted.py b/dak/process_accepted.py index 605b5c23..94c2ea30 100755 --- a/dak/process_accepted.py +++ b/dak/process_accepted.py @@ -31,10 +31,11 @@ import errno, fcntl, os, sys, time, re import apt_pkg -import daklib.database as database -import daklib.logging as logging -import daklib.queue as queue -import daklib.utils as utils +from daklib import database +from daklib import logging +from daklib import queue +from daklib import utils +from daklib.dak_exceptions import * ############################################################################### @@ -354,8 +355,7 @@ def install (): projectB.query("INSERT INTO binaries (package, version, maintainer, source, architecture, file, type, sig_fpr) VALUES ('%s', '%s', %d, %d, %d, %d, '%s', %d)" % (package, version, maintainer_id, source_id, architecture_id, files[file]["files id"], type, fingerprint_id)) else: - projectB.query("INSERT INTO binaries (package, version, maintainer, architecture, file, type, sig_fpr) VALUES ('%s', '%s', %d, %d, %d, '%s', %d)" - % (package, version, maintainer_id, architecture_id, files[file]["files id"], type, fingerprint_id)) + raise NoSourceFieldError, "Unable to find a source id for %s (%s), %s, file %s, type %s, signed by %s" % (package, version, architecture, file, type, sig_fpr) for suite in changes["distribution"].keys(): suite_id = database.get_suite_id(suite) projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%d, currval('binaries_id_seq'))" % (suite_id))