X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_upload.py;h=ab9a3197ddc199ebe34a1eed5d5e24b6897ce9ae;hb=b7f4f39d244e3282303015c9ff4a116252a64613;hp=3e923ea05825211c71e12746eb1756256817496e;hpb=b485ac748f8c5f0fce8ea434622ad0ca01a1d769;p=dak.git diff --git a/dak/process_upload.py b/dak/process_upload.py index 3e923ea0..ab9a3197 100755 --- a/dak/process_upload.py +++ b/dak/process_upload.py @@ -125,20 +125,53 @@ Checks Debian packages from Incoming ## pu: create files for BTS ## pu: create entry in queue_build ## pu: check overrides -import errno + +# Integrity checks +## GPG +## Parsing changes (check for duplicates) +## Parse dsc +## file list checks + +# New check layout (TODO: Implement) +## Permission checks +### suite mappings +### ACLs +### version checks (suite) +### override checks + +## Source checks +### copy orig +### unpack +### BTS changelog +### src contents +### lintian +### urgency log + +## Binary checks +### timestamps +### control checks +### src relation check +### contents + +## Database insertion (? copy from stuff) +### BYHAND / NEW / Policy queues +### Pool + +## Queue builds + +from errno import EACCES, EAGAIN import fcntl import os import sys -#from datetime import datetime import traceback import apt_pkg +from sqlalchemy.orm.exc import NoResultFound from daklib import daklog from daklib.queue import * +from daklib.queue_install import * from daklib import utils from daklib.dbconn import * -#from daklib.dak_exceptions import * -#from daklib.regexes import re_default_answer, re_issource, re_fdnic from daklib.urgencylog import UrgencyLog from daklib.summarystats import SummaryStats from daklib.holding import Holding @@ -163,7 +196,126 @@ def usage (exit_code=0): ############################################################################### -def process_it(changes_file): +def action(u, session): + cnf = Config() + holding = Holding() + + # changes["distribution"] may not exist in corner cases + # (e.g. unreadable changes files) + if not u.pkg.changes.has_key("distribution") or not isinstance(u.pkg.changes["distribution"], dict): + u.pkg.changes["distribution"] = {} + + (summary, short_summary) = u.build_summaries() + + (prompt, answer) = ("", "XXX") + if Options["No-Action"] or Options["Automatic"]: + answer = 'S' + + queuekey = '' + + pi = u.package_info() + + try: + chg = session.query(DBChange).filter_by(changesname=os.path.basename(u.pkg.changes_file)).one() + except NoResultFound, e: + chg = None + + if len(u.rejects) > 0: + if u.upload_too_new(): + print "SKIP (too new)\n" + pi, + prompt = "[S]kip, Quit ?" + else: + print "REJECT\n" + pi + prompt = "[R]eject, Skip, Quit ?" + if Options["Automatic"]: + answer = 'R' + else: + # Are we headed for NEW / BYHAND / AUTOBYHAND? + # Note that policy queues are no longer handled here + qu = determine_target(u) + if qu: + print "%s for %s\n%s%s" % ( qu.upper(), ", ".join(u.pkg.changes["distribution"].keys()), pi, summary) + queuekey = qu[0].upper() + if queuekey in "RQSA": + queuekey = "D" + prompt = "[D]ivert, Skip, Quit ?" + else: + prompt = "[%s]%s, Skip, Quit ?" % (queuekey, qu[1:].lower()) + if Options["Automatic"]: + answer = queuekey + else: + # Does suite have a policy_queue configured + divert = False + for s in u.pkg.changes["distribution"].keys(): + suite = get_suite(s, session) + if suite.policy_queue: + if not chg or chg.approved_for_id != su.policy_queue.policy_queue_id: + # This routine will check whether the upload is a binary + # upload when the source is already in the target suite. If + # so, we skip the policy queue, otherwise we go there. + divert = package_to_suite(u, suite.suite_name, session=session) + if divert: + print "%s for %s\n%s%s" % ( suite.policy_queue.queue_name.upper(), + ", ".join(u.pkg.changes["distribution"].keys()), + pi, summary) + queuekey = "P" + prompt = "[P]olicy, Skip, Quit ?" + policyqueue = suite.policy_queue + if Options["Automatic"]: + answer = 'P' + break + + if not divert: + print "ACCEPT\n" + pi + summary, + prompt = "[A]ccept, Skip, Quit ?" + if Options["Automatic"]: + answer = 'A' + + while prompt.find(answer) == -1: + answer = utils.our_raw_input(prompt) + m = re_default_answer.match(prompt) + if answer == "": + answer = m.group(1) + answer = answer[:1].upper() + + if answer == 'R': + os.chdir(u.pkg.directory) + u.do_reject(0, pi) + elif answer == 'A': + if not chg: + chg = u.pkg.add_known_changes(holding.holding_dir, session=session) + u.accept(summary, short_summary, session) + u.check_override() + chg.clean_from_queue() + session.commit() + u.remove() + elif answer == 'P': + if not chg: + chg = u.pkg.add_known_changes(holding.holding_dir, session=session) + package_to_queue(u, summary, short_summary, policyqueue, chg, session) + chg.upload_into_db(u, holding.holding_dir) + session.commit() + u.remove() + elif answer == queuekey: + if not chg: + chg = u.pkg.add_known_changes(holding.holding_dir, session=session) + QueueInfo[qu]["process"](u, summary, short_summary, chg, session) + chg.upload_into_db(u, holding.holding_dir) + session.commit() + u.remove() + elif answer == 'Q': + sys.exit(0) + + session.commit() + +############################################################################### + +def cleanup(): + h = Holding() + if not Options["No-Action"]: + h.clean() + +def process_it(changes_file, session): global Logger Logger.log(["Processing changes file", changes_file]) @@ -172,6 +324,9 @@ def process_it(changes_file): holding = Holding() + # TODO: Actually implement using pending* tables so that we don't lose track + # of what is where + u = Upload() u.pkg.changes_file = changes_file u.pkg.directory = os.getcwd() @@ -229,15 +384,17 @@ def process_it(changes_file): u.check_timestamps() u.check_signed_by_key() -# action(u) + action(u, session) except (SystemExit, KeyboardInterrupt): + cleanup() raise except: print "ERROR" traceback.print_exc(file=sys.stderr) + cleanup() # Restore previous WD os.chdir(u.prevdir) @@ -316,18 +473,23 @@ def main(): for changes_file in changes_files: print "\n" + changes_file session = DBConn().session() - process_it(changes_file) + process_it(changes_file, session) session.close() if summarystats.accept_count: sets = "set" if summarystats.accept_count > 1: sets = "sets" - sys.stderr.write("Installed %d package %s, %s.\n" % (summarystats.accept_count, sets, - utils.size_type(int(summarystats.accept_bytes)))) + print "Installed %d package %s, %s." % (summarystats.accept_count, sets, + utils.size_type(int(summarystats.accept_bytes))) Logger.log(["total", summarystats.accept_count, summarystats.accept_bytes]) if not Options["No-Action"]: + # Clean out the queue files + session = DBConn().session() + session.execute("DELETE FROM changes_pending_files WHERE id NOT IN (SELECT file_id FROM changes_pending_files_map )") + session.commit() + if log_urgency: UrgencyLog().close() Logger.close()