X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.py;h=0031d5645c03b719f2b695dd2ad1a928b9077074;hb=30b41506a6105ab23a0cac9e8197475a89236224;hp=246477788ca51e4414e92098bf7bb21cf9f96826;hpb=eb995fdaa1ecfe19da5b5ebbe3c42d08c000e6ac;p=dak.git diff --git a/katie.py b/katie.py index 24647778..0031d564 100644 --- a/katie.py +++ b/katie.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # Utility functions for katie -# Copyright (C) 2001 James Troup -# $Id: katie.py,v 1.3 2002-02-15 02:54:22 troup Exp $ +# Copyright (C) 2001, 2002 James Troup +# $Id: katie.py,v 1.19 2002-05-10 00:24:33 troup Exp $ # 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,7 +20,7 @@ ############################################################################### -import cPickle, errno, os, pg, re, stat, string; +import cPickle, errno, os, pg, re, stat, string, sys, tempfile, time; import utils, db_access; import apt_inst, apt_pkg; @@ -54,7 +54,7 @@ class nmu_p: self.group_maint = {}; self.Cnf = Cnf; if Cnf.get("Dinstall::GroupOverrideFilename"): - filename = Cnf["Dir::OverrideDir"] + Cnf["Dinstall::GroupOverrideFilename"]; + filename = Cnf["Dir::Override"] + Cnf["Dinstall::GroupOverrideFilename"]; file = utils.open_file(filename); for line in file.readlines(): line = lower(string.strip(utils.re_comments.sub('', line))); @@ -152,20 +152,23 @@ class Katie: for i in [ "package", "version", "architecture", "type", "size", "md5sum", "component", "location id", "source package", "source version", "maintainer", "dbtype", "files id", - "new", "section", "priority", "oldfiles", "othercomponents" ]: + "new", "section", "priority", "oldfiles", "othercomponents", + "pool name" ]: if files[file].has_key(i): d_files[file][i] = files[file][i]; ## changes # Mandatory changes fields for i in [ "distribution", "source", "architecture", "version", "maintainer", - "urgency", "fingerprint" ]: + "urgency", "fingerprint", "changedby822", "changedbyname", + "maintainername", "maintaineremail", "closes" ]: d_changes[i] = changes[i]; # Optional changes fields - for i in [ "changed-by", "changedby822", "maintainer822", "filecontents" ]: - if d_changes.has_key(i): + # FIXME: changes should be mandatory + for i in [ "changed-by", "maintainer822", "filecontents", "format", "changes" ]: + if changes.has_key(i): d_changes[i] = changes[i]; ## dsc - for i in [ "source", "version", "maintainer", "fingerprint" ]: + for i in [ "source", "version", "maintainer", "fingerprint", "uploaders" ]: if dsc.has_key(i): d_dsc[i] = dsc[i]; ## dsc_files @@ -214,6 +217,11 @@ class Katie: if self.Cnf.has_key("Dinstall::TrackingServer") and changes.has_key("source"): Subst["__MAINTAINER_TO__"] = Subst["__MAINTAINER_TO__"] + "\nBcc: %s@%s" % (changes["source"], self.Cnf["Dinstall::TrackingServer"]) + # Apply any global override of the Maintainer field + if self.Cnf.get("Dinstall::OverrideMaintainer"): + Subst["__MAINTAINER_TO__"] = self.Cnf["Dinstall::OverrideMaintainer"]; + Subst["__MAINTAINER_FROM__"] = self.Cnf["Dinstall::OverrideMaintainer"]; + Subst["__REJECT_MESSAGE__"] = reject_message; Subst["__SOURCE__"] = changes.get("source", "Unknown"); Subst["__VERSION__"] = changes.get("version", "Unknown"); @@ -263,68 +271,85 @@ class Katie: ########################################################################### - def announce (self, short_summary, action): + def close_bugs (self, summary, action): + changes = self.pkg.changes; Subst = self.Subst; Cnf = self.Cnf; - changes = self.pkg.changes; - dsc = self.pkg.dsc; - - # Only do announcements for source uploads with a recent dpkg-dev installed - if float(changes.get("format", 0)) < 1.6 or not changes["architecture"].has_key("source"): - return "" - lists_done = {} - summary = "" - Subst["__SHORT_SUMMARY__"] = short_summary; + bugs = changes["closes"].keys(); - for dist in changes["distribution"].keys(): - list = Cnf.Find("Suite::%s::Announce" % (dist)) - if list == "" or lists_done.has_key(list): - continue - lists_done[list] = 1 - summary = summary + "Announcing to %s\n" % (list) + if not bugs: + return summary; - if action: - Subst["__ANNOUNCE_LIST_ADDRESS__"] = list; - mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/jennifer.announce","r").read()); - utils.send_mail (mail_message, "") - - bugs = changes["closes"].keys() - bugs.sort() + bugs.sort(); if not self.nmu.is_an_nmu(self.pkg): - summary = summary + "Closing bugs: " + summary = summary + "Closing bugs: "; for bug in bugs: - summary = summary + "%s " % (bug) + summary = summary + "%s " % (bug); if action: Subst["__BUG_NUMBER__"] = bug; if changes["distribution"].has_key("stable"): Subst["__STABLE_WARNING__"] = """ - Note that this package is not part of the released stable Debian - distribution. It may have dependencies on other unreleased software, - or other instabilities. Please take care if you wish to install it. - The update will eventually make its way into the next released Debian - distribution.""" +Note that this package is not part of the released stable Debian +distribution. It may have dependencies on other unreleased software, +or other instabilities. Please take care if you wish to install it. +The update will eventually make its way into the next released Debian +distribution."""; else: Subst["__STABLE_WARNING__"] = ""; - mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/jennifer.bug-close","r").read()); - utils.send_mail (mail_message, "") + mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.bug-close"); + utils.send_mail (mail_message, ""); if action: self.Logger.log(["closing bugs"]+bugs); else: # NMU - summary = summary + "Setting bugs to severity fixed: " - control_message = "" + summary = summary + "Setting bugs to severity fixed: "; + control_message = ""; for bug in bugs: - summary = summary + "%s " % (bug) - control_message = control_message + "tag %s + fixed\n" % (bug) + summary = summary + "%s " % (bug); + control_message = control_message + "tag %s + fixed\n" % (bug); if action and control_message != "": Subst["__CONTROL_MESSAGE__"] = control_message; - mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/jennifer.bug-nmu-fixed","r").read()); - utils.send_mail (mail_message, "") + mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.bug-nmu-fixed"); + utils.send_mail (mail_message, ""); if action: self.Logger.log(["setting bugs to fixed"]+bugs); - summary = summary + "\n" + summary = summary + "\n"; + return summary; - return summary + ########################################################################### + + def announce (self, short_summary, action): + Subst = self.Subst; + Cnf = self.Cnf; + changes = self.pkg.changes; + dsc = self.pkg.dsc; + + # Only do announcements for source uploads with a recent dpkg-dev installed + if float(changes.get("format", 0)) < 1.6 or not changes["architecture"].has_key("source"): + return ""; + + lists_done = {}; + summary = ""; + Subst["__SHORT_SUMMARY__"] = short_summary; + + for dist in changes["distribution"].keys(): + list = Cnf.Find("Suite::%s::Announce" % (dist)); + if list == "" or lists_done.has_key(list): + continue; + lists_done[list] = 1; + summary = summary + "Announcing to %s\n" % (list); + + if action: + Subst["__ANNOUNCE_LIST_ADDRESS__"] = list; + if Cnf.get("Dinstall::TrackingServer") and changes["architecture"].has_key("source"): + Subst["__ANNOUNCE_LIST_ADDRESS__"] = Subst["__ANNOUNCE_LIST_ADDRESS__"] + "\nBcc: %s@%s" % (changes["source"], Cnf["Dinstall::TrackingServer"]); + mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.announce"); + utils.send_mail (mail_message, ""); + + if Cnf.get("Dinstall::CloseBugs"): + summary = self.close_bugs(summary, action); + + return summary; ########################################################################### @@ -336,13 +361,13 @@ class Katie: print "Accepting." self.Logger.log(["Accepting changes",self.pkg.changes_file]); - self.dump_vars(Cnf["Dir::QueueAcceptedDir"]); + self.dump_vars(Cnf["Dir::Queue::Accepted"]); # Move all the files into the accepted directory - utils.move(self.pkg.changes_file, Cnf["Dir::QueueAcceptedDir"]); + utils.move(self.pkg.changes_file, Cnf["Dir::Queue::Accepted"]); file_keys = files.keys(); for file in file_keys: - utils.move(file, Cnf["Dir::QueueAcceptedDir"]); + utils.move(file, Cnf["Dir::Queue::Accepted"]); self.accept_bytes = self.accept_bytes + float(files[file]["size"]) self.accept_count = self.accept_count + 1; @@ -351,19 +376,58 @@ class Katie: if not Cnf["Dinstall::Options::No-Mail"]: Subst["__SUITE__"] = ""; Subst["__SUMMARY__"] = summary; - mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/jennifer.accepted","r").read()); + mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.accepted"); utils.send_mail(mail_message, "") self.announce(short_summary, 1) + # Special support to enable clean auto-building of accepted packages + if Cnf.FindB("Dinstall::SpecialAcceptedAutoBuild") and \ + self.pkg.changes["distribution"].has_key("unstable"): + self.projectB.query("BEGIN WORK"); + for file in file_keys: + src = os.path.join(Cnf["Dir::Queue::Accepted"], file); + dest = os.path.join(Cnf["Dir::AcceptedAutoBuild"], file); + # Create a symlink to it + os.symlink(src, dest); + # Add it to the list of packages for later processing by apt-ftparchive + self.projectB.query("INSERT INTO unstable_accepted (filename, in_accepted) VALUES ('%s', 't')" % (dest)); + # If the .orig.tar.gz is in the pool, create a symlink to + # it (if one doesn't already exist) + if self.pkg.orig_tar_id: + # Determine the .orig.tar.gz file name + for dsc_file in self.pkg.dsc_files.keys(): + if dsc_file[-12:] == ".orig.tar.gz": + filename = dsc_file; + dest = os.path.join(Cnf["Dir::AcceptedAutoBuild"],filename); + # If it doesn't exist, create a symlink + if not os.path.exists(dest): + # Find the .orig.tar.gz in the pool + q = self.projectB.query("SELECT l.path, f.filename from location l, files f WHERE f.id = %s and f.location = l.id" % (self.pkg.orig_tar_id)); + ql = q.getresult(); + if not ql: + utils.fubar("[INTERNAL ERROR] Couldn't find id %s in files table." % (self.pkg.orig_tar_id)); + src = os.path.join(ql[0][0], ql[0][1]); + os.symlink(src, dest); + # Add it to the list of packages for later processing by apt-ftparchive + self.projectB.query("INSERT INTO unstable_accepted (filename, in_accepted) VALUES ('%s', 't')" % (dest)); + + self.projectB.query("COMMIT WORK"); + ########################################################################### def check_override (self): Subst = self.Subst; changes = self.pkg.changes; files = self.pkg.files; + Cnf = self.Cnf; - # Only check section & priority on sourceful uploads - if not changes["architecture"].has_key("source"): + # Abandon the check if: + # a) it's a non-sourceful upload + # b) override disparity checks have been disabled + # c) we're not sending mail + if not changes["architecture"].has_key("source") or \ + not Cnf.FindB("Dinstall::OverrideDisparityCheck") or \ + Cnf["Dinstall::Options::No-Mail"]: return; summary = ""; @@ -385,7 +449,7 @@ class Katie: return; Subst["__SUMMARY__"] = summary; - mail_message = utils.TemplateSubst(Subst,utils.open_file(self.Cnf["Dir::TemplatesDir"]+"/jennifer.override-disparity").read()); + mail_message = utils.TemplateSubst(Subst,self.Cnf["Dir::Templates"]+"/jennifer.override-disparity"); utils.send_mail (mail_message, ""); ########################################################################### @@ -401,13 +465,13 @@ class Katie: # Skip any files which don't exist or which we don't have permission to copy. if os.access(file,os.R_OK) == 0: continue; - dest_file = os.path.join(Cnf["Dir::QueueRejectDir"], file); + dest_file = os.path.join(Cnf["Dir::Queue::Reject"], file); try: os.open(dest_file, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644); except OSError, e: # File exists? Let's try and move it to the morgue if errno.errorcode[e.errno] == 'EEXIST': - morgue_file = os.path.join(Cnf["Dir::Morgue"],Cnf["Dir::MorgueRejectDir"],file); + morgue_file = os.path.join(Cnf["Dir::Morgue"],Cnf["Dir::MorgueReject"],file); try: morgue_file = utils.find_next_free(morgue_file); except utils.tried_too_hard_exc: @@ -415,7 +479,7 @@ class Katie: # someone is trying to exploit us. utils.warn("**WARNING** failed to move %s from the reject directory to the morgue." % (file)); return; - utils.move(dest_file, morgue_file); + utils.move(dest_file, morgue_file, perms=0660); try: os.open(dest_file, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644); except OSError, e: @@ -426,11 +490,40 @@ class Katie: raise; # If we got here, we own the destination file, so we can # safely overwrite it. - utils.move(file, dest_file, 1); + utils.move(file, dest_file, 1, perms=0660); ########################################################################### def do_reject (self, manual = 0, reject_message = ""): + # If we weren't given a manual rejection message, spawn an + # editor so the user can add one in... + if manual and not reject_message: + temp_filename = tempfile.mktemp(); + fd = os.open(temp_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700); + os.close(fd); + 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 = string.join(file.readlines()); + file.close(); + print "Reject message:"; + print utils.prefix_multi_line_string(reject_message," "); + prompt = "[R]eject, Edit, Abandon, Quit ?" + answer = "XXX"; + while string.find(prompt, answer) == -1: + answer = utils.our_raw_input(prompt); + m = re_default_answer.search(prompt); + if answer == "": + answer = m.group(1); + answer = string.upper(answer[:1]); + os.unlink(temp_filename); + if answer == 'A': + return 1; + elif answer == 'Q': + sys.exit(0); + print "Rejecting.\n" Cnf = self.Cnf; @@ -438,7 +531,7 @@ class Katie: pkg = self.pkg; reason_filename = pkg.changes_file[:-8] + ".reason"; - reject_filename = Cnf["Dir::QueueRejectDir"] + '/' + reason_filename; + reject_filename = Cnf["Dir::Queue::Reject"] + '/' + reason_filename; # Move all the files into the reject directory reject_files = pkg.files.keys() + [pkg.changes_file]; @@ -456,6 +549,7 @@ class Katie: Subst["__CC__"] = "X-Katie-Rejection: automatic (moo)"; os.write(fd, reject_message); os.close(fd); + reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/katie.rejected"); else: # Build up the rejection email user_email_address = utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"]); @@ -463,26 +557,18 @@ class Katie: Subst["__REJECTOR_ADDRESS__"] = user_email_address; Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message; Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"]; - reject_mail_message = utils.TemplateSubst(Subst,utils.open_file(Cnf["Dir::TemplatesDir"]+"/katie.rejected").read()); + reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/katie.rejected"); # Write the rejection email out as the .reason file os.write(fd, reject_mail_message); os.close(fd); - # If we weren't given a manual rejection message, spawn an - # editor so the user can add one in... - if reject_message == "": - editor = os.environ.get("EDITOR","vi") - result = os.system("%s +6 %s" % (editor, reject_filename)) - if result != 0: - utils.fubar("editor invocation failed for '%s'!" % (reject_filename), result); - # Send the rejection mail if appropriate if not Cnf["Dinstall::Options::No-Mail"]: - reject_mail_message = utils.TemplateSubst(Subst,utils.open_file(Cnf["Dir::TemplatesDir"]+"/katie.rejected").read()); utils.send_mail (reject_mail_message, ""); self.Logger.log(["rejected", pkg.changes_file]); + return 0; ################################################################################ @@ -562,7 +648,11 @@ class Katie: def reject (self, str, prefix="Rejected: "): if str: - self.reject_message = self.reject_message + prefix + str + "\n"; + # Unlike other rejects we add new lines first to avoid trailing + # new lines when this message is passed back up to a caller. + if self.reject_message: + self.reject_message = self.reject_message + "\n"; + self.reject_message = self.reject_message + prefix + str; def check_binaries_against_db(self, file, suite): self.reject_message = ""; @@ -575,11 +665,11 @@ class Katie: files[file]["oldfiles"][suite] = oldfile; # Check versions [NB: per-suite only; no cross-suite checking done (yet)] if apt_pkg.VersionCompare(files[file]["version"], oldfile["version"]) != 1: - reject("%s Old version `%s' >= new version `%s'." % (file, oldfile["version"], files[file]["version"])); + self.reject("%s: old version (%s) >= new version (%s)." % (file, oldfile["version"], files[file]["version"])); # Check for any existing copies of the file q = self.projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND a.arch_string = '%s' AND a.id = b.architecture" % (files[file]["package"], files[file]["version"], files[file]["architecture"])) if q.getresult() != []: - reject("can not overwrite existing copy of '%s' already in the archive." % (file)); + self.reject("can not overwrite existing copy of '%s' already in the archive." % (file)); return self.reject_message; @@ -599,7 +689,7 @@ class Katie: ql = map(lambda x: x[0], q.getresult()); for old_version in ql: if apt_pkg.VersionCompare(new_version, old_version) != 1: - reject("%s: Old version `%s' >= new version `%s'." % (file, old_version, new_version)); + self.reject("%s: Old version `%s' >= new version `%s'." % (file, old_version, new_version)); return self.reject_message; ################################################################################ @@ -615,12 +705,13 @@ class Katie: # to work harder to cope with the multiple possible # locations of an .orig.tar.gz. for dsc_file in dsc_files.keys(): + found = None; if files.has_key(dsc_file): actual_md5 = files[dsc_file]["md5sum"]; actual_size = int(files[dsc_file]["size"]); found = "%s in incoming" % (dsc_file) # Check the file does not already exist in the archive - q = self.projectB.query("SELECT f.id FROM files f, location l WHERE (f.filename ~ '/%s$' OR f.filename = '%s') AND l.id = f.location" % (utils.regex_safe(dsc_file), dsc_file)); + q = self.projectB.query("SELECT f.size, f.md5sum FROM files f, location l WHERE (f.filename ~ '/%s$' OR f.filename = '%s') AND l.id = f.location" % (utils.regex_safe(dsc_file), dsc_file)); # "It has not broken them. It has fixed a # brokenness. Your crappy hack exploited a bug in @@ -631,8 +722,21 @@ class Katie: # the same name and version.)" # -- ajk@ on d-devel@l.d.o - if q.getresult() != []: - reject("can not overwrite existing copy of '%s' already in the archive." % (dsc_file)); + ql = q.getresult(); + if ql: + # Ignore exact matches for .orig.tar.gz + match = 0; + if dsc_file[-12:] == ".orig.tar.gz": + for i in ql: + if files.has_key(dsc_file) and \ + int(files[dsc_file]["size"]) == int(i[0]) and \ + files[dsc_file]["md5sum"] == i[1]: + self.reject("ignoring %s, since it's already in the archive." % (dsc_file), "Warning: "); + del files[dsc_file]; + match = 1; + + if not match: + self.reject("can not overwrite existing copy of '%s' already in the archive." % (dsc_file)); elif dsc_file[-12:] == ".orig.tar.gz": # Check in the pool q = self.projectB.query("SELECT l.path, f.filename, l.type, f.id, l.id FROM files f, location l WHERE (f.filename ~ '/%s$' OR f.filename = '%s') AND l.id = f.location" % (utils.regex_safe(dsc_file), dsc_file)); @@ -669,22 +773,37 @@ class Katie: else: self.pkg.orig_tar_location = x[4]; else: + # Not there? Check the queue directories... - # Not there? Check in Incoming... - # [See comment above jennifer's process_it() for - # explanation of why this is necessary...] - orig_tar_gz = self.pkg.directory + '/' + dsc_file; - if os.path.exists(orig_tar_gz): - return (self.reject_message, orig_tar_gz); + in_unchecked = os.path.join(self.Cnf["Dir::Queue::Unchecked"],dsc_file); + # See process_it() in jennifer for explanation of this + if os.path.exists(in_unchecked): + return (self.reject_message, in_unchecked); else: - reject("%s refers to %s, but I can't find it in Incoming or in the pool." % (file, dsc_file)); + for dir in [ "Accepted", "New", "Byhand" ]: + in_otherdir = os.path.join(self.Cnf["Dir::Queue::%s" % (dir)],dsc_file); + if os.path.exists(in_otherdir): + actual_md5 = apt_pkg.md5sum(utils.open_file(in_otherdir)); + actual_size = os.stat(in_otherdir)[stat.ST_SIZE]; + found = in_otherdir; + + if not found: + self.reject("%s refers to %s, but I can't find it in the queue or in the pool." % (file, dsc_file)); continue; else: - reject("%s refers to %s, but I can't find it in Incoming." % (file, dsc_file)); + self.reject("%s refers to %s, but I can't find it in the queue." % (file, dsc_file)); continue; if actual_md5 != dsc_files[dsc_file]["md5sum"]: - reject("md5sum for %s doesn't match %s." % (found, file)); + self.reject("md5sum for %s doesn't match %s." % (found, file)); if actual_size != int(dsc_files[dsc_file]["size"]): - reject("size for %s doesn't match %s." % (found, file)); + self.reject("size for %s doesn't match %s." % (found, file)); return (self.reject_message, orig_tar_gz); + + def do_query(self, q): + sys.stderr.write("query: \"%s\" ... " % (q)); + before = time.time(); + r = self.projectB.query(q); + time_diff = time.time()-before; + sys.stderr.write("took %.3f seconds.\n" % (time_diff)); + return r;