X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Freject_proposed_updates.py;h=d04dbeb39a6b4a800de4717d0134b0dfa6a97866;hb=d9822f04453a1b62ca0aa66e2efeea35f654778f;hp=72bd88007f458b2df5ccd4b22c0e90c7ad278619;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py old mode 100755 new mode 100644 index 72bd8800..d04dbeb3 --- a/dak/reject_proposed_updates.py +++ b/dak/reject_proposed_updates.py @@ -1,8 +1,7 @@ #!/usr/bin/env python # Manually reject packages for proprosed-updates -# Copyright (C) 2001, 2002, 2003, 2004 James Troup -# $Id: lauren,v 1.4 2004-04-01 17:13:11 troup Exp $ +# Copyright (C) 2001, 2002, 2003, 2004, 2006 James Troup # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,25 +19,26 @@ ################################################################################ -import os, pg, sys; -import db_access, katie, logging, utils; -import apt_pkg; +import os, pg, sys +import apt_pkg +import daklib.database +import daklib.logging +import daklib.queue +import daklib.utils ################################################################################ # Globals -lauren_version = "$Revision: 1.4 $"; - -Cnf = None; -Options = None; -projectB = None; -Katie = None; -Logger = None; +Cnf = None +Options = None +projectB = None +Upload = None +Logger = None ################################################################################ def usage(exit_code=0): - print """Usage: lauren .CHANGES[...] + print """Usage: dak reject-proposed-updates .CHANGES[...] Manually reject the .CHANGES file(s). -h, --help show this help and exit. @@ -49,154 +49,154 @@ Manually reject the .CHANGES file(s). ################################################################################ def main(): - global Cnf, Logger, Options, projectB, Katie; + global Cnf, Logger, Options, projectB, Upload - Cnf = utils.get_conf(); - Arguments = [('h',"help","Lauren::Options::Help"), - ('m',"manual-reject","Lauren::Options::Manual-Reject", "HasArg"), - ('s',"no-mail", "Lauren::Options::No-Mail")]; + Cnf = daklib.utils.get_conf() + Arguments = [('h',"help","Reject-Proposed-Updates::Options::Help"), + ('m',"manual-reject","Reject-Proposed-Updates::Options::Manual-Reject", "HasArg"), + ('s',"no-mail", "Reject-Proposed-Updates::Options::No-Mail")] for i in [ "help", "manual-reject", "no-mail" ]: - if not Cnf.has_key("Lauren::Options::%s" % (i)): - Cnf["Lauren::Options::%s" % (i)] = ""; + if not Cnf.has_key("Reject-Proposed-Updates::Options::%s" % (i)): + Cnf["Reject-Proposed-Updates::Options::%s" % (i)] = "" - arguments = apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv); + arguments = apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv) - Options = Cnf.SubTree("Lauren::Options"); + Options = Cnf.SubTree("Reject-Proposed-Updates::Options") if Options["Help"]: - usage(); + usage() if not arguments: - utils.fubar("need at least one .changes filename as an argument."); + daklib.utils.fubar("need at least one .changes filename as an argument.") - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); - db_access.init(Cnf, projectB); + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) + daklib.database.init(Cnf, projectB) - Katie = katie.Katie(Cnf); - Logger = Katie.Logger = logging.Logger(Cnf, "lauren"); + Upload = daklib.queue.Upload(Cnf) + Logger = Upload.Logger = daklib.logging.Logger(Cnf, "reject-proposed-updates") - bcc = "X-Katie: lauren %s" % (lauren_version); + bcc = "X-DAK: dak rejected-proposed-updates\nX-Katie: lauren $Revision: 1.4 $" if Cnf.has_key("Dinstall::Bcc"): - Katie.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]); + Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) else: - Katie.Subst["__BCC__"] = bcc; + Upload.Subst["__BCC__"] = bcc for arg in arguments: - arg = utils.validate_changes_file_arg(arg); - Katie.pkg.changes_file = arg; - Katie.init_vars(); - cwd = os.getcwd(); - os.chdir(Cnf["Suite::Proposed-Updates::CopyKatie"]); - Katie.update_vars(); - os.chdir(cwd); - Katie.update_subst(); + arg = daklib.utils.validate_changes_file_arg(arg) + Upload.pkg.changes_file = arg + Upload.init_vars() + cwd = os.getcwd() + os.chdir(Cnf["Suite::Proposed-Updates::CopyDotDak"]) + Upload.update_vars() + os.chdir(cwd) + Upload.update_subst() print arg - done = 0; - prompt = "Manual reject, [S]kip, Quit ?"; + done = 0 + prompt = "Manual reject, [S]kip, Quit ?" while not done: - answer = "XXX"; + answer = "XXX" while prompt.find(answer) == -1: - answer = utils.our_raw_input(prompt); - m = katie.re_default_answer.search(prompt); + answer = daklib.utils.our_raw_input(prompt) + m = daklib.queue.re_default_answer.search(prompt) if answer == "": answer = m.group(1) answer = answer[:1].upper() if answer == 'M': - aborted = reject(Options["Manual-Reject"]); + aborted = reject(Options["Manual-Reject"]) if not aborted: - done = 1; + done = 1 elif answer == 'S': - done = 1; + done = 1 elif answer == 'Q': sys.exit(0) - Logger.close(); + Logger.close() ################################################################################ def reject (reject_message = ""): - files = Katie.pkg.files; - dsc = Katie.pkg.dsc; - changes_file = Katie.pkg.changes_file; + files = Upload.pkg.files + dsc = Upload.pkg.dsc + changes_file = Upload.pkg.changes_file # If we weren't given a manual rejection message, spawn an editor # so the user can add one in... if not reject_message: - temp_filename = utils.temp_filename(); + temp_filename = daklib.utils.temp_filename() editor = os.environ.get("EDITOR","vi") - answer = 'E'; + answer = 'E' while answer == 'E': os.system("%s %s" % (editor, temp_filename)) - file = utils.open_file(temp_filename); - reject_message = "".join(file.readlines()); - file.close(); - print "Reject message:"; - print utils.prefix_multi_line_string(reject_message," ", include_blank_lines=1); + file = daklib.utils.open_file(temp_filename) + reject_message = "".join(file.readlines()) + file.close() + print "Reject message:" + print daklib.utils.prefix_multi_line_string(reject_message," ", include_blank_lines=1) prompt = "[R]eject, Edit, Abandon, Quit ?" - answer = "XXX"; + answer = "XXX" while prompt.find(answer) == -1: - answer = utils.our_raw_input(prompt); - m = katie.re_default_answer.search(prompt); + answer = daklib.utils.our_raw_input(prompt) + m = daklib.queue.re_default_answer.search(prompt) if answer == "": - answer = m.group(1); - answer = answer[:1].upper(); - os.unlink(temp_filename); + answer = m.group(1) + answer = answer[:1].upper() + os.unlink(temp_filename) if answer == 'A': - return 1; + return 1 elif answer == 'Q': - sys.exit(0); + sys.exit(0) print "Rejecting.\n" # Reject the .changes file - Katie.force_reject([changes_file]); + Upload.force_reject([changes_file]) # Setup the .reason file - reason_filename = changes_file[:-8] + ".reason"; - reject_filename = Cnf["Dir::Queue::Reject"] + '/' + reason_filename; + reason_filename = changes_file[:-8] + ".reason" + reject_filename = Cnf["Dir::Queue::Reject"] + '/' + reason_filename # If we fail here someone is probably trying to exploit the race # so let's just raise an exception ... if os.path.exists(reject_filename): - os.unlink(reject_filename); - reject_fd = os.open(reject_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644); + os.unlink(reject_filename) + reject_fd = os.open(reject_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644) # Build up the rejection email - user_email_address = utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"]); + user_email_address = daklib.utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"]) - Katie.Subst["__REJECTOR_ADDRESS__"] = user_email_address; - Katie.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message; - Katie.Subst["__STABLE_REJECTOR__"] = Cnf["Lauren::StableRejector"]; - Katie.Subst["__MORE_INFO_URL__"] = Cnf["Lauren::MoreInfoURL"]; - Katie.Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"]; - reject_mail_message = utils.TemplateSubst(Katie.Subst,Cnf["Dir::Templates"]+"/lauren.stable-rejected"); + Upload.Subst["__REJECTOR_ADDRESS__"] = user_email_address + Upload.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message + Upload.Subst["__STABLE_REJECTOR__"] = Cnf["Reject-Proposed-Updates::StableRejector"] + Upload.Subst["__MORE_INFO_URL__"] = Cnf["Reject-Proposed-Updates::MoreInfoURL"] + Upload.Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"] + reject_mail_message = daklib.utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/reject-proposed-updates.rejected") # Write the rejection email out as the .reason file - os.write(reject_fd, reject_mail_message); - os.close(reject_fd); + os.write(reject_fd, reject_mail_message) + os.close(reject_fd) # Remove the packages from proposed-updates - suite_id = db_access.get_suite_id('proposed-updates'); + suite_id = daklib.database.get_suite_id('proposed-updates') - projectB.query("BEGIN WORK"); + projectB.query("BEGIN WORK") # Remove files from proposed-updates suite for file in files.keys(): if files[file]["type"] == "dsc": - package = dsc["source"]; + package = dsc["source"] version = dsc["version"]; # NB: not files[file]["version"], that has no epoch - q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, version)); - ql = q.getresult(); + q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, version)) + ql = q.getresult() if not ql: - utils.fubar("reject: Couldn't find %s_%s in source table." % (package, version)); - source_id = ql[0][0]; - projectB.query("DELETE FROM src_associations WHERE suite = '%s' AND source = '%s'" % (suite_id, source_id)); + daklib.utils.fubar("reject: Couldn't find %s_%s in source table." % (package, version)) + source_id = ql[0][0] + projectB.query("DELETE FROM src_associations WHERE suite = '%s' AND source = '%s'" % (suite_id, source_id)) elif files[file]["type"] == "deb": - package = files[file]["package"]; - version = files[file]["version"]; - architecture = files[file]["architecture"]; - q = projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND (a.arch_string = '%s' OR a.arch_string = 'all') AND b.architecture = a.id" % (package, version, architecture)); - ql = q.getresult(); + package = files[file]["package"] + version = files[file]["version"] + architecture = files[file]["architecture"] + q = projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND (a.arch_string = '%s' OR a.arch_string = 'all') AND b.architecture = a.id" % (package, version, architecture)) + ql = q.getresult() # Horrible hack to work around partial replacement of # packages with newer versions (from different source @@ -204,24 +204,24 @@ def reject (reject_message = ""): # newer version of the package and only do the # warn&continue thing if it finds one. if not ql: - utils.warn("reject: Couldn't find %s_%s_%s in binaries table." % (package, version, architecture)); + daklib.utils.warn("reject: Couldn't find %s_%s_%s in binaries table." % (package, version, architecture)) else: - binary_id = ql[0][0]; - projectB.query("DELETE FROM bin_associations WHERE suite = '%s' AND bin = '%s'" % (suite_id, binary_id)); - projectB.query("COMMIT WORK"); + binary_id = ql[0][0] + projectB.query("DELETE FROM bin_associations WHERE suite = '%s' AND bin = '%s'" % (suite_id, binary_id)) + projectB.query("COMMIT WORK") # Send the rejection mail if appropriate if not Options["No-Mail"]: - utils.send_mail(reject_mail_message); + daklib.utils.send_mail(reject_mail_message) - # Finally remove the .katie file - katie_file = os.path.join(Cnf["Suite::Proposed-Updates::CopyKatie"], os.path.basename(changes_file[:-8]+".katie")); - os.unlink(katie_file); + # Finally remove the .dak file + dot_dak_file = os.path.join(Cnf["Suite::Proposed-Updates::CopyDotDak"], os.path.basename(changes_file[:-8]+".dak")) + os.unlink(dot_dak_file) - Logger.log(["rejected", changes_file]); - return 0; + Logger.log(["rejected", changes_file]) + return 0 ################################################################################ if __name__ == '__main__': - main(); + main()