X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Freject_proposed_updates.py;h=89efaae61ac6061fe024c07e68f858c54325330e;hb=935bd2ad8079341123590d80658562d81ac87c86;hp=dfcbd31e303db4c30aeeea34d216d5a1eb062cfd;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py index dfcbd31e..89efaae6 100755 --- 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 $ +""" Manually reject packages for proprosed-updates """ +# 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 @@ -21,24 +20,25 @@ ################################################################################ import os, pg, sys -import db_access, katie, logging, utils import apt_pkg +from daklib.dbconn import * +from daklib import daklog +from daklib.queue import Upload +from daklib import utils +from daklib.regexes import re_default_answer + ################################################################################ # Globals -lauren_version = "$Revision: 1.4 $" - Cnf = None Options = None -projectB = None -Katie = 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,45 +49,46 @@ Manually reject the .CHANGES file(s). ################################################################################ def main(): - global Cnf, Logger, Options, projectB, Katie + global Cnf, Logger, Options 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")] + 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) - 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.") - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - db_access.init(Cnf, projectB) + # Initialise database + dbconn = DBConn() - Katie = katie.Katie(Cnf) - Logger = Katie.Logger = logging.Logger(Cnf, "lauren") + Logger = daklog.Logger(Cnf, "reject-proposed-updates") - bcc = "X-Katie: lauren %s" % (lauren_version) - if Cnf.has_key("Dinstall::Bcc"): - Katie.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) - else: - Katie.Subst["__BCC__"] = bcc + bcc = "X-DAK: dak rejected-proposed-updates\nX-Katie: lauren $Revision: 1.4 $" 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(Cnf["Suite::Proposed-Updates::CopyDotDak"]) + + u = Upload() + u = load_dot_dak(arg) + + if Cnf.has_key("Dinstall::Bcc"): + u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) + else: + u.Subst["__BCC__"] = bcc + u.update_subst() + os.chdir(cwd) - Katie.update_subst() print arg done = 0 @@ -97,13 +98,13 @@ def main(): while prompt.find(answer) == -1: answer = utils.our_raw_input(prompt) - m = katie.re_default_answer.search(prompt) + m = 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(u, Options["Manual-Reject"]) if not aborted: done = 1 elif answer == 'S': @@ -115,29 +116,29 @@ def main(): ################################################################################ -def reject (reject_message = ""): - files = Katie.pkg.files - dsc = Katie.pkg.dsc - changes_file = Katie.pkg.changes_file +def reject (u, reject_message = ""): + files = u.pkg.files + dsc = u.pkg.dsc + changes_file = u.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() + (fd, temp_filename) = utils.temp_filename() editor = os.environ.get("EDITOR","vi") 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() + f = os.fdopen(fd) + reject_message = "".join(f.readlines()) + f.close() print "Reject message:" print utils.prefix_multi_line_string(reject_message," ", include_blank_lines=1) prompt = "[R]eject, Edit, Abandon, Quit ?" answer = "XXX" while prompt.find(answer) == -1: answer = utils.our_raw_input(prompt) - m = katie.re_default_answer.search(prompt) + m = re_default_answer.search(prompt) if answer == "": answer = m.group(1) answer = answer[:1].upper() @@ -150,7 +151,7 @@ def reject (reject_message = ""): print "Rejecting.\n" # Reject the .changes file - Katie.force_reject([changes_file]) + u.force_reject([changes_file]) # Setup the .reason file reason_filename = changes_file[:-8] + ".reason" @@ -159,64 +160,73 @@ def reject (reject_message = ""): # 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) + 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"]) - 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") + u.Subst["__REJECTOR_ADDRESS__"] = user_email_address + u.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message + u.Subst["__STABLE_REJECTOR__"] = Cnf["Reject-Proposed-Updates::StableRejector"] + u.Subst["__STABLE_MAIL__"] = Cnf["Reject-Proposed-Updates::StableMail"] + u.Subst["__MORE_INFO_URL__"] = Cnf["Reject-Proposed-Updates::MoreInfoURL"] + u.Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"] + reject_mail_message = utils.TemplateSubst(u.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) + session = DBConn().session() + # Remove the packages from proposed-updates - suite_id = db_access.get_suite_id('proposed-updates') + suite_name = 'proposed-updates' - projectB.query("BEGIN WORK") # Remove files from proposed-updates suite - for file in files.keys(): - if files[file]["type"] == "dsc": + for f in files.keys(): + if files[f]["type"] == "dsc": 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() - if not ql: + version = dsc["version"]; # NB: not files[f]["version"], that has no epoch + + source = get_sources_from_name(package, version, session=session) + if len(source) != 1: 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() + + source = source[0] + + for sa in source.srcassociations: + if sa.suite.suite_name == suite_name: + session.delete(sa) + + elif files[f]["type"] == "deb": + package = files[f]["package"] + version = files[f]["version"] + architecture = files[f]["architecture"] + + binary = get_binaries_from_name(package, version [architecture, 'all']) # Horrible hack to work around partial replacement of # packages with newer versions (from different source # packages). This, obviously, should instead check for a # newer version of the package and only do the # warn&continue thing if it finds one. - if not ql: + if len(binary) != 1: 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") + for ba in binary[0].binassociations: + if ba.suite.suite_name == suite_name: + session.delete(ba) + + session.commit() # Send the rejection mail if appropriate if not Options["No-Mail"]: 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