X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_upload.py;h=4d9f3b00b768071363bd9ac74c72cefe19de7e74;hb=27e00376e81d1c37ff327ee0d39670b266418869;hp=ec7fbd35a19a70e05be39d803516bc0fccf6ca1d;hpb=3fd95d52f5c4a4761a1e332d469c6948e091723c;p=dak.git diff --git a/dak/process_upload.py b/dak/process_upload.py index ec7fbd35..4d9f3b00 100755 --- a/dak/process_upload.py +++ b/dak/process_upload.py @@ -176,6 +176,7 @@ from daklib.urgencylog import UrgencyLog from daklib.summarystats import SummaryStats from daklib.holding import Holding from daklib.config import Config +from daklib.regexes import re_match_expired ############################################################################### @@ -196,7 +197,18 @@ def usage (exit_code=0): ############################################################################### +def byebye(): + 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() + + + def action(u, session): + global Logger + cnf = Config() holding = Holding() @@ -217,7 +229,7 @@ def action(u, session): try: chg = session.query(DBChange).filter_by(changesname=os.path.basename(u.pkg.changes_file)).one() - except NoResultFound, e: + except NoResultFound as e: chg = None if len(u.rejects) > 0: @@ -249,7 +261,7 @@ def action(u, session): 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: + if not chg or chg.approved_for_id != suite.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. @@ -283,24 +295,27 @@ def action(u, session): u.do_reject(0, pi) elif answer == 'A': if not chg: - chg = u.pkg.add_known_changes(holding.holding_dir, session=session) + chg = u.pkg.add_known_changes(holding.holding_dir, session=session, logger=Logger) + session.commit() 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) + chg = u.pkg.add_known_changes(holding.holding_dir, session=session, logger=Logger) package_to_queue(u, summary, short_summary, policyqueue, chg, session) session.commit() u.remove() elif answer == queuekey: if not chg: - chg = u.pkg.add_known_changes(holding.holding_dir, session=session) + chg = u.pkg.add_known_changes(holding.holding_dir, session=session, logger=Logger) QueueInfo[qu]["process"](u, summary, short_summary, chg, session) session.commit() u.remove() elif answer == 'Q': + byebye() sys.exit(0) session.commit() @@ -349,7 +364,7 @@ def process_it(changes_file, session): # If this is the Real Thing(tm), copy things into a private # holding directory first to avoid replacable file races. if not Options["No-Action"]: - os.chdir(cnf["Dir::Queue::Holding"]) + holding.chdir_to_holding() # Absolutize the filename to avoid the requirement of being in the # same directory as the .changes file. @@ -366,6 +381,12 @@ def process_it(changes_file, session): if u.pkg.changes["fingerprint"]: valid_changes_p = u.load_changes(changespath) else: + for reason in rejects: + if re_match_expired.match(reason): + # Hrm, key expired. Lets see if we can still parse the .changes before + # we reject. Then we would be able to mail the maintainer, instead of + # just silently dropping the upload. + u.load_changes(changespath) valid_changes_p = False u.rejects.extend(rejects) @@ -375,8 +396,9 @@ def process_it(changes_file, session): valid_dsc_p = u.check_dsc(not Options["No-Action"]) if valid_dsc_p and not Options["No-Action"]: u.check_source() - u.check_lintian() u.check_hashes() + if valid_dsc_p and not Options["No-Action"] and not len(u.rejects): + u.check_lintian() u.check_urgency() u.check_timestamps() u.check_signed_by_key() @@ -402,7 +424,6 @@ def main(): cnf = Config() summarystats = SummaryStats() - log_urgency = False DBConn() @@ -434,20 +455,20 @@ def main(): # Obtain lock if not in no-action mode and initialize the log if not Options["No-Action"]: - lock_fd = os.open(cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT) + lock_fd = os.open(os.path.join(cnf["Dir::Lock"], 'dinstall.lock'), os.O_RDWR | os.O_CREAT) try: fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB) - except IOError, e: + except IOError as e: if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN': utils.fubar("Couldn't obtain lock; assuming another 'dak process-upload' is already running.") else: raise - if cnf.get("Dir::UrgencyLog"): - # Initialise UrgencyLog() - log_urgency = True - UrgencyLog() - Logger = daklog.Logger(cnf, "process-upload", Options["No-Action"]) + # Initialise UrgencyLog() - it will deal with the case where we don't + # want to log urgencies + urgencylog = UrgencyLog() + + Logger = daklog.Logger("process-upload", Options["No-Action"]) # If we have a directory flag, use it to find our files if cnf["Dinstall::Options::Directory"] != "": @@ -481,9 +502,18 @@ def main(): utils.size_type(int(summarystats.accept_bytes))) Logger.log(["total", summarystats.accept_count, summarystats.accept_bytes]) + if summarystats.reject_count: + sets = "set" + if summarystats.reject_count > 1: + sets = "sets" + print "Rejected %d package %s." % (summarystats.reject_count, sets) + Logger.log(["rejected", summarystats.reject_count]) + + byebye() + if not Options["No-Action"]: - if log_urgency: - UrgencyLog().close() + urgencylog.close() + Logger.close() ###############################################################################