X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Freject_proposed_updates.py;h=e2168072c8b4e70eb13032a7537a08253eb91f8e;hb=9af3682a124014b128df6e2eb5c936cdb67c8c84;hp=d04dbeb39a6b4a800de4717d0134b0dfa6a97866;hpb=d9822f04453a1b62ca0aa66e2efeea35f654778f;p=dak.git diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py old mode 100644 new mode 100755 index d04dbeb3..e2168072 --- a/dak/reject_proposed_updates.py +++ b/dak/reject_proposed_updates.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Manually reject packages for proprosed-updates +""" 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 @@ -19,20 +19,20 @@ ################################################################################ -import os, pg, sys +import os, sys import apt_pkg -import daklib.database -import daklib.logging -import daklib.queue -import daklib.utils + +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 Cnf = None Options = None -projectB = None -Upload = None Logger = None ################################################################################ @@ -49,9 +49,9 @@ Manually reject the .CHANGES file(s). ################################################################################ def main(): - global Cnf, Logger, Options, projectB, Upload + global Cnf, Logger, Options - Cnf = daklib.utils.get_conf() + Cnf = 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")] @@ -65,29 +65,30 @@ def main(): if Options["Help"]: usage() if not arguments: - daklib.utils.fubar("need at least one .changes filename as an argument.") + utils.fubar("need at least one .changes filename as an argument.") - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - daklib.database.init(Cnf, projectB) + # Initialise database + dbconn = DBConn() - Upload = daklib.queue.Upload(Cnf) - Logger = Upload.Logger = daklib.logging.Logger(Cnf, "reject-proposed-updates") + Logger = daklog.Logger(Cnf, "reject-proposed-updates") bcc = "X-DAK: dak rejected-proposed-updates\nX-Katie: lauren $Revision: 1.4 $" - if Cnf.has_key("Dinstall::Bcc"): - Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) - else: - Upload.Subst["__BCC__"] = bcc for arg in arguments: - arg = daklib.utils.validate_changes_file_arg(arg) - Upload.pkg.changes_file = arg - Upload.init_vars() + arg = utils.validate_changes_file_arg(arg) cwd = os.getcwd() os.chdir(Cnf["Suite::Proposed-Updates::CopyDotDak"]) - Upload.update_vars() + + 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) - Upload.update_subst() print arg done = 0 @@ -96,14 +97,14 @@ def main(): answer = "XXX" while prompt.find(answer) == -1: - answer = daklib.utils.our_raw_input(prompt) - m = daklib.queue.re_default_answer.search(prompt) + answer = utils.our_raw_input(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 = Upload.pkg.files - dsc = Upload.pkg.dsc - changes_file = Upload.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 = daklib.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 = daklib.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 daklib.utils.prefix_multi_line_string(reject_message," ", include_blank_lines=1) + 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 = daklib.utils.our_raw_input(prompt) - m = daklib.queue.re_default_answer.search(prompt) + answer = utils.our_raw_input(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 - Upload.force_reject([changes_file]) + u.force_reject([changes_file]) # Setup the .reason file reason_filename = changes_file[:-8] + ".reason" @@ -163,56 +164,65 @@ def reject (reject_message = ""): reject_fd = os.open(reject_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644) # Build up the rejection email - user_email_address = daklib.utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"]) + user_email_address = utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"]) - 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") + 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 = daklib.database.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: - 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() + 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 = 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: - daklib.utils.warn("reject: Couldn't find %s_%s_%s in binaries table." % (package, version, architecture)) + 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"]: - daklib.utils.send_mail(reject_mail_message) + utils.send_mail(reject_mail_message) # Finally remove the .dak file dot_dak_file = os.path.join(Cnf["Suite::Proposed-Updates::CopyDotDak"], os.path.basename(changes_file[:-8]+".dak"))