X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=ca61ee3e3a4c5e2a806d354742c92cb554b4d09f;hb=1c35448b880358d020e81339657e3435fdda9434;hp=7b0f9aba8e3897b26c8e6c4a55da5486a60e5766;hpb=56f84fd91dd27a077535c9bfeb7db237537f6b9a;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 7b0f9aba..ca61ee3e 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -5,6 +5,7 @@ Checks Debian packages from Incoming @contact: Debian FTP Master @copyright: 2000, 2001, 2002, 2003, 2004, 2005, 2006 James Troup @copyright: 2009 Joerg Jaspert +@copyright: 2009 Mark Hymers @license: GNU General Public License version 2 or later """ @@ -47,16 +48,18 @@ import tarfile import apt_inst import apt_pkg from debian_bundle import deb822 -from daklib.dbconn import DBConn + +from daklib.dbconn import * from daklib.binary import Binary -from daklib import logging -from daklib import queue +from daklib import daklog +from daklib.queue import * from daklib import utils +from daklib.textutils import fix_maintainer from daklib.dak_exceptions import * -from daklib.regexes import re_valid_version, re_valid_pkg_name, re_changelog_versions, \ - re_strip_revision, re_strip_srcver, re_spacestrip, \ - re_isanum, re_no_epoch, re_no_revision, re_taint_free, \ - re_isadeb, re_extract_src_version, re_issource, re_default_answer +from daklib.regexes import re_default_answer +from daklib.summarystats import SummaryStats +from daklib.holding import Holding +from daklib.config import Config from types import * @@ -66,31 +69,16 @@ from types import * ################################################################################ # Globals -Cnf = None Options = None Logger = None -Upload = None - -reprocess = 0 -in_holding = {} - -# Aliases to the real vars in the Upload class; hysterical raisins. -reject_message = "" -changes = {} -dsc = {} -dsc_files = {} -files = {} -pkg = {} ############################################################################### def init(): - global Cnf, Options, Upload, changes, dsc, dsc_files, files, pkg + global Options apt_pkg.init() - - Cnf = apt_pkg.newConfiguration() - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()) + cnf = Config() Arguments = [('a',"automatic","Dinstall::Options::Automatic"), ('h',"help","Dinstall::Options::Help"), @@ -101,30 +89,22 @@ def init(): for i in ["automatic", "help", "no-action", "no-lock", "no-mail", "override-distribution", "version", "directory"]: - Cnf["Dinstall::Options::%s" % (i)] = "" + cnf["Dinstall::Options::%s" % (i)] = "" - changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Dinstall::Options") + changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) + Options = cnf.SubTree("Dinstall::Options") if Options["Help"]: usage() # If we have a directory flag, use it to find our files - if Cnf["Dinstall::Options::Directory"] != "": + if cnf["Dinstall::Options::Directory"] != "": # Note that we clobber the list of files we were given in this case # so warn if the user has done both if len(changes_files) > 0: utils.warn("Directory provided so ignoring files given on command line") - changes_files = utils.get_changes_files(Cnf["Dinstall::Options::Directory"]) - - Upload = queue.Upload(Cnf) - - changes = Upload.pkg.changes - dsc = Upload.pkg.dsc - dsc_files = Upload.pkg.dsc_files - files = Upload.pkg.files - pkg = Upload.pkg + changes_files = utils.get_changes_files(cnf["Dinstall::Options::Directory"]) return changes_files @@ -1159,10 +1139,10 @@ def upload_too_new(): def action (): # changes["distribution"] may not exist in corner cases # (e.g. unreadable changes files) - if not changes.has_key("distribution") or not isinstance(changes["distribution"], DictType): - changes["distribution"] = {} + if not u.pkg.changes.has_key("distribution") or not isinstance(u.pkg.changes["distribution"], DictType): + u.pkg.changes["distribution"] = {} - (summary, short_summary) = Upload.build_summaries() + (summary, short_summary) = u.build_summaries() # q-unapproved hax0ring queue_info = { @@ -1170,13 +1150,14 @@ def action (): "Autobyhand" : { "is" : is_autobyhand, "process": do_autobyhand }, "Byhand" : { "is": is_byhand, "process": do_byhand }, "OldStableUpdate" : { "is": is_oldstableupdate, - "process": do_oldstableupdate }, + "process": do_oldstableupdate }, "StableUpdate" : { "is": is_stableupdate, "process": do_stableupdate }, "Unembargo" : { "is": is_unembargo, "process": queue_unembargo }, "Embargo" : { "is": is_embargo, "process": queue_embargo }, } + queues = [ "New", "Autobyhand", "Byhand" ] - if Cnf.FindB("Dinstall::SecurityQueueHandling"): + if cnf.FindB("Dinstall::SecurityQueueHandling"): queues += [ "Unembargo", "Embargo" ] else: queues += [ "OldStableUpdate", "StableUpdate" ] @@ -1187,25 +1168,25 @@ def action (): queuekey = '' - if reject_message.find("Rejected") != -1: - if upload_too_new(): - print "SKIP (too new)\n" + reject_message, + pi = u.package_info() + + if len(u.rejects) > 0: + if u.upload_too_new(): + print "SKIP (too new)\n" + pi, prompt = "[S]kip, Quit ?" else: - print "REJECT\n" + reject_message, + print "REJECT\n" + pi prompt = "[R]eject, Skip, Quit ?" if Options["Automatic"]: answer = 'R' else: qu = None for q in queues: - if queue_info[q]["is"](): + if queue_info[q]["is"](u): qu = q break if qu: - print "%s for %s\n%s%s" % ( - qu.upper(), ", ".join(changes["distribution"].keys()), - reject_message, summary), + 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" @@ -1215,7 +1196,7 @@ def action (): if Options["Automatic"]: answer = queuekey else: - print "ACCEPT\n" + reject_message + summary, + print "ACCEPT\n" + pi + summary, prompt = "[A]ccept, Skip, Quit ?" if Options["Automatic"]: answer = 'A' @@ -1228,182 +1209,135 @@ def action (): answer = answer[:1].upper() if answer == 'R': - os.chdir (pkg.directory) - Upload.do_reject(0, reject_message) + os.chdir(u.pkg.directory) + u.do_reject(0, pi) elif answer == 'A': - accept(summary, short_summary) - remove_from_unchecked() + u.accept(summary, short_summary) + u.check_override() + u.remove() elif answer == queuekey: - queue_info[qu]["process"](summary, short_summary) - remove_from_unchecked() + queue_info[qu]["process"](u, summary, short_summary) + u.remove() elif answer == 'Q': sys.exit(0) -def remove_from_unchecked(): - os.chdir (pkg.directory) - for f in files.keys(): - os.unlink(f) - os.unlink(pkg.changes_file) - ################################################################################ -def accept (summary, short_summary): - Upload.accept(summary, short_summary) - Upload.check_override() +def package_to_suite(u, suite): + if not u.pkg.changes["distribution"].has_key(suite): + return False -################################################################################ + ret = True -def move_to_dir (dest, perms=0660, changesperms=0664): - utils.move (pkg.changes_file, dest, perms=changesperms) - file_keys = files.keys() - for f in file_keys: - utils.move (f, dest, perms=perms) - -################################################################################ - -def is_unembargo (): - cursor = DBConn().cursor() - cursor.execute( "SELECT package FROM disembargo WHERE package = %(source)s AND version = %(version)s", changes ) - if cursor.fetchone(): - return 1 + if not u.pkg.changes["architecture"].has_key("source"): + s = DBConn().session() + q = s.query(SrcAssociation.sa_id) + q = q.join(Suite).filter_by(suite_name=suite) + q = q.join(DBSource).filter_by(source=u.pkg.changes['source']) + q = q.filter_by(version=u.pkg.changes['version']).limit(1) - oldcwd = os.getcwd() - os.chdir(Cnf["Dir::Queue::Disembargo"]) - disdir = os.getcwd() - os.chdir(oldcwd) + if q.count() < 1: + ret = False - if pkg.directory == disdir: - if changes["architecture"].has_key("source"): - if Options["No-Action"]: return 1 + s.close() - cursor.execute( "INSERT INTO disembargo (package, version) VALUES ('%(package)s', '%(version)s')", - changes ) - cursor.execute( "COMMIT" ) - return 1 + return ret - return 0 +def package_to_queue(u, summary, short_summary, queue, perms=0660, build=True, announce=None): + cnf = Config() + dir = cnf["Dir::Queue::%s" % queue] -def queue_unembargo (summary, short_summary): - print "Moving to UNEMBARGOED holding area." - Logger.log(["Moving to unembargoed", pkg.changes_file]) + print "Moving to %s holding area" % queue.upper() + Logger.log(["Moving to %s" % queue, u.pkg.changes_file]) - Upload.dump_vars(Cnf["Dir::Queue::Unembargoed"]) - move_to_dir(Cnf["Dir::Queue::Unembargoed"]) - Upload.queue_build("unembargoed", Cnf["Dir::Queue::Unembargoed"]) + u.pkg.write_dot_dak(dir) + u.move_to_dir(dir, perms=perms) + if build: + get_queue(queue.lower()).autobuild_upload(u.pkg, dir) # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() - - # Send accept mail, announce to lists, close bugs and check for - # override disparities - if not Cnf["Dinstall::Options::No-Mail"]: - Upload.Subst["__SUITE__"] = "" - mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-unchecked.accepted") + u.check_override() + + # Send accept mail, announce to lists and close bugs + if announce and not cnf["Dinstall::Options::No-Mail"]: + template = os.path.join(cnf["Dir::Templates"], announce) + u.update_subst() + u.Subst["__SUITE__"] = "" + mail_message = utils.TemplateSubst(u.Subst, template) utils.send_mail(mail_message) - Upload.announce(short_summary, 1) + u.announce(short_summary, True) ################################################################################ -def is_embargo (): - # if embargoed queues are enabled always embargo - return 1 +def is_unembargo(u): + session = DBConn().session() + cnf = Config() -def queue_embargo (summary, short_summary): - print "Moving to EMBARGOED holding area." - Logger.log(["Moving to embargoed", pkg.changes_file]) + q = session.execute("SELECT package FROM disembargo WHERE package = :source AND version = :version", u.pkg.changes) + if q.rowcount > 0: + session.close() + return True - Upload.dump_vars(Cnf["Dir::Queue::Embargoed"]) - move_to_dir(Cnf["Dir::Queue::Embargoed"]) - Upload.queue_build("embargoed", Cnf["Dir::Queue::Embargoed"]) + oldcwd = os.getcwd() + os.chdir(cnf["Dir::Queue::Disembargo"]) + disdir = os.getcwd() + os.chdir(oldcwd) - # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() - - # Send accept mail, announce to lists, close bugs and check for - # override disparities - if not Cnf["Dinstall::Options::No-Mail"]: - Upload.Subst["__SUITE__"] = "" - mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-unchecked.accepted") - utils.send_mail(mail_message) - Upload.announce(short_summary, 1) + ret = False -################################################################################ + if u.pkg.directory == disdir: + if u.pkg.changes["architecture"].has_key("source"): + if not Options["No-Action"]: + session.execute("INSERT INTO disembargo (package, version) VALUES (:package, :version)", u.pkg.changes) + session.commit() -def is_stableupdate (): - if not changes["distribution"].has_key("proposed-updates"): - return 0 + ret = True - if not changes["architecture"].has_key("source"): - pusuite = DBConn().get_suite_id("proposed-updates") - cursor = DBConn().cursor() - cursor.execute( """SELECT 1 FROM source s - JOIN src_associations sa ON (s.id = sa.source) - WHERE s.source = %(source)s - AND s.version = %(version)s - AND sa.suite = %(suite)s""", - {'source' : changes['source'], - 'version' : changes['version'], - 'suite' : pusuite}) - - if cursor.fetchone(): - # source is already in proposed-updates so no need to hold - return 0 + session.close() - return 1 + return ret -def do_stableupdate (summary, short_summary): - print "Moving to PROPOSED-UPDATES holding area." - Logger.log(["Moving to proposed-updates", pkg.changes_file]) +def queue_unembargo(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "Unembargoed", + perms=0660, build=True, announce='process-unchecked.accepted') - Upload.dump_vars(Cnf["Dir::Queue::ProposedUpdates"]) - move_to_dir(Cnf["Dir::Queue::ProposedUpdates"], perms=0664) +################################################################################ - # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() +def is_embargo(u): + # if embargoed queues are enabled always embargo + return True -################################################################################ +def queue_embargo(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "Unembargoed", + perms=0660, build=True, announce='process-unchecked.accepted') -def is_oldstableupdate (): - if not changes["distribution"].has_key("oldstable-proposed-updates"): - return 0 +################################################################################ - if not changes["architecture"].has_key("source"): - pusuite = DBConn().get_suite_id("oldstable-proposed-updates") - cursor = DBConn().cursor() - cursor.execute( """SELECT 1 FROM source s - JOIN src_associations sa ON (s.id = sa.source) - WHERE s.source = %(source)s - AND s.version = %(version)s - AND sa.suite = %(suite)s""", - {'source' : changes['source'], - 'version' : changes['version'], - 'suite' : pusuite}) - if cursor.fetchone(): - return 0 +def is_stableupdate(u): + return package_to_suite(u, 'proposed-updates') - return 1 +def do_stableupdate(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "ProposedUpdates", + perms=0664, build=False, announce=None) -def do_oldstableupdate (summary, short_summary): - print "Moving to OLDSTABLE-PROPOSED-UPDATES holding area." - Logger.log(["Moving to oldstable-proposed-updates", pkg.changes_file]) +################################################################################ - Upload.dump_vars(Cnf["Dir::Queue::OldProposedUpdates"]) - move_to_dir(Cnf["Dir::Queue::OldProposedUpdates"], perms=0664) +def is_oldstableupdate(u): + return package_to_suite(u, 'oldstable-proposed-updates') - # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() +def do_oldstableupdate(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "OldProposedUpdates", + perms=0664, build=False, announce=None) ################################################################################ -def is_autobyhand (): +def is_autobyhand(u): + cnf = Config() + all_auto = 1 any_auto = 0 - for f in files.keys(): - if files[f].has_key("byhand"): + for f in u.pkg.files.keys(): + if u.pkg.files[f].has_key("byhand"): any_auto = 1 # filename is of form "PKG_VER_ARCH.EXT" where PKG, VER and ARCH @@ -1415,95 +1349,98 @@ def is_autobyhand (): continue (pckg, ver, archext) = f.split("_", 2) - if archext.count(".") < 1 or changes["version"] != ver: + if archext.count(".") < 1 or u.pkg.changes["version"] != ver: all_auto = 0 continue - ABH = Cnf.SubTree("AutomaticByHandPackages") + ABH = cnf.SubTree("AutomaticByHandPackages") if not ABH.has_key(pckg) or \ - ABH["%s::Source" % (pckg)] != changes["source"]: - print "not match %s %s" % (pckg, changes["source"]) + ABH["%s::Source" % (pckg)] != u.pkg.changes["source"]: + print "not match %s %s" % (pckg, u.pkg.changes["source"]) all_auto = 0 continue (arch, ext) = archext.split(".", 1) - if arch not in changes["architecture"]: + if arch not in u.pkg.changes["architecture"]: all_auto = 0 continue - files[f]["byhand-arch"] = arch - files[f]["byhand-script"] = ABH["%s::Script" % (pckg)] + u.pkg.files[f]["byhand-arch"] = arch + u.pkg.files[f]["byhand-script"] = ABH["%s::Script" % (pckg)] return any_auto and all_auto -def do_autobyhand (summary, short_summary): +def do_autobyhand(u, summary, short_summary): print "Attempting AUTOBYHAND." - byhandleft = 0 - for f in files.keys(): + byhandleft = True + for f, entry in u.pkg.files.items(): byhandfile = f - if not files[f].has_key("byhand"): + + if not entry.has_key("byhand"): continue - if not files[f].has_key("byhand-script"): - byhandleft = 1 + + if not entry.has_key("byhand-script"): + byhandleft = True continue os.system("ls -l %s" % byhandfile) + result = os.system("%s %s %s %s %s" % ( - files[f]["byhand-script"], byhandfile, - changes["version"], files[f]["byhand-arch"], - os.path.abspath(pkg.changes_file))) + entry["byhand-script"], + byhandfile, + u.pkg.changes["version"], + entry["byhand-arch"], + os.path.abspath(u.pkg.changes_file))) + if result == 0: os.unlink(byhandfile) - del files[f] + del entry else: print "Error processing %s, left as byhand." % (f) - byhandleft = 1 + byhandleft = True if byhandleft: - do_byhand(summary, short_summary) + do_byhand(u, summary, short_summary) else: - accept(summary, short_summary) + u.accept(summary, short_summary) + u.check_override() + # XXX: We seem to be missing a u.remove() here + # This might explain why we get byhand leftovers in unchecked - mhy ################################################################################ -def is_byhand (): - for f in files.keys(): - if files[f].has_key("byhand"): - return 1 - return 0 - -def do_byhand (summary, short_summary): - print "Moving to BYHAND holding area." - Logger.log(["Moving to byhand", pkg.changes_file]) +def is_byhand(u): + for f in u.pkg.files.keys(): + if u.pkg.files[f].has_key("byhand"): + return True + return False - Upload.dump_vars(Cnf["Dir::Queue::Byhand"]) - move_to_dir(Cnf["Dir::Queue::Byhand"]) - - # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() +def do_byhand(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "Byhand", + perms=0660, build=False, announce=None) ################################################################################ -def is_new (): - for f in files.keys(): - if files[f].has_key("new"): - return 1 - return 0 +def is_new(u): + for f in u.pkg.files.keys(): + if u.pkg.files[f].has_key("new"): + return True + return False -def acknowledge_new (summary, short_summary): - Subst = Upload.Subst +def acknowledge_new(u, summary, short_summary): + cnf = Config() print "Moving to NEW holding area." - Logger.log(["Moving to new", pkg.changes_file]) + Logger.log(["Moving to new", u.pkg.changes_file]) - Upload.dump_vars(Cnf["Dir::Queue::New"]) - move_to_dir(Cnf["Dir::Queue::New"], perms=0640, changesperms=0644) + u.pkg.write_dot_dak(cnf["Dir::Queue::New"]) + u.move_to_dir(cnf["Dir::Queue::New"], perms=0640, changesperms=0644) if not Options["No-Mail"]: print "Sending new ack." - Subst["__SUMMARY__"] = summary - new_ack_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/process-unchecked.new") + template = os.path.join(cnf["Dir::Templates"], 'process-unchecked.new') + u.Subst["__SUMMARY__"] = summary + new_ack_message = utils.TemplateSubst(u.Subst, template) utils.send_mail(new_ack_message) ################################################################################ @@ -1517,73 +1454,99 @@ def acknowledge_new (summary, short_summary): # we force the .orig.tar.gz into the .changes structure and reprocess # the .changes file. -def process_it (changes_file): - global reprocess, reject_message +def process_it(changes_file): + global Logger + + cnf = Config() + + holding = Holding() + + u = Upload() + u.pkg.changes_file = changes_file + u.pkg.directory = os.getcwd() + u.logger = Logger - # Reset some globals - reprocess = 1 - Upload.init_vars() # Some defaults in case we can't fully process the .changes file - changes["maintainer2047"] = Cnf["Dinstall::MyEmailAddress"] - changes["changedby2047"] = Cnf["Dinstall::MyEmailAddress"] - reject_message = "" + u.pkg.changes["maintainer2047"] = cnf["Dinstall::MyEmailAddress"] + u.pkg.changes["changedby2047"] = cnf["Dinstall::MyEmailAddress"] - # Absolutize the filename to avoid the requirement of being in the - # same directory as the .changes file. - pkg.changes_file = os.path.abspath(changes_file) + # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header + bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $" + if cnf.has_key("Dinstall::Bcc"): + u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"]) + else: + u.Subst["__BCC__"] = bcc # Remember where we are so we can come back after cd-ing into the - # holding directory. - pkg.directory = os.getcwd() + # holding directory. TODO: Fix this stupid hack + u.prevdir = os.getcwd() + + # TODO: Figure out something better for this (or whether it's even + # necessary - it seems to have been for use when we were + # still doing the is_unchecked check; reprocess = 2) + u.reprocess = 1 try: # 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"]) - copy_to_holding(pkg.changes_file) + os.chdir(cnf["Dir::Queue::Holding"]) + + # Absolutize the filename to avoid the requirement of being in the + # same directory as the .changes file. + holding.copy_to_holding(os.path.abspath(changes_file)) + # Relativize the filename so we use the copy in holding # rather than the original... - pkg.changes_file = os.path.basename(pkg.changes_file) - changes["fingerprint"] = utils.check_signature(pkg.changes_file, reject) - if changes["fingerprint"]: - valid_changes_p = check_changes() + changespath = os.path.basename(u.pkg.changes_file) + + (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changespath) + + if u.pkg.changes["fingerprint"]: + valid_changes_p = u.load_changes(changespath) else: - valid_changes_p = 0 + valid_changes_p = False + u.rejects.extend(rejects) + if valid_changes_p: - while reprocess: - check_distributions() - check_files() - valid_dsc_p = check_dsc() + while u.reprocess: + u.check_distributions() + u.check_files(not Options["No-Action"]) + valid_dsc_p = u.check_dsc(not Options["No-Action"]) if valid_dsc_p: - check_source() - check_hashes() - check_urgency() - check_timestamps() - check_signed_by_key() - Upload.update_subst(reject_message) - action() + u.check_source() + u.check_hashes() + u.check_urgency() + u.check_timestamps() + u.check_signed_by_key() + + action(u) + except SystemExit: raise + except: print "ERROR" traceback.print_exc(file=sys.stderr) - pass # Restore previous WD - os.chdir(pkg.directory) + os.chdir(u.prevdir) ############################################################################### def main(): - global Cnf, Options, Logger + global Options, Logger + cnf = Config() changes_files = init() # -n/--dry-run invalidates some other options which would involve things happening if Options["No-Action"]: Options["Automatic"] = "" + # Initialize our Holding singleton + holding = Holding() + # Ensure all the arguments we were given are .changes files for f in changes_files: if not f.endswith(".changes"): @@ -1591,20 +1554,18 @@ def main(): changes_files.remove(f) if changes_files == []: - if Cnf["Dinstall::Options::Directory"] == "": + if cnf["Dinstall::Options::Directory"] == "": utils.fubar("Need at least one .changes file as an argument.") else: sys.exit(0) # Check that we aren't going to clash with the daily cron job - - if not Options["No-Action"] and os.path.exists("%s/daily.lock" % (Cnf["Dir::Lock"])) and not Options["No-Lock"]: + if not Options["No-Action"] and os.path.exists("%s/daily.lock" % (cnf["Dir::Lock"])) and not Options["No-Lock"]: utils.fubar("Archive maintenance in progress. Try again later.") # 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(cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT) try: fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError, e: @@ -1612,15 +1573,7 @@ def main(): utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.") else: raise - Logger = Upload.Logger = logging.Logger(Cnf, "process-unchecked") - - # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header - bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $" - if Cnf.has_key("Dinstall::Bcc"): - Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) - else: - Upload.Subst["__BCC__"] = bcc - + Logger = daklog.Logger(cnf, "process-unchecked") # Sort the .changes files so that we process sourceful ones first changes_files.sort(utils.changes_compare) @@ -1632,10 +1585,11 @@ def main(): process_it (changes_file) finally: if not Options["No-Action"]: - clean_holding() + holding.clean() + + accept_count = SummaryStats().accept_count + accept_bytes = SummaryStats().accept_bytes - accept_count = Upload.accept_count - accept_bytes = Upload.accept_bytes if accept_count: sets = "set" if accept_count > 1: