X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.py;h=876e2f37bf6117a09a54a57b018bb7a54601bcb1;hb=73299e3d3d571ea12e5a08248420b8f93340cc0b;hp=246477788ca51e4414e92098bf7bb21cf9f96826;hpb=eb995fdaa1ecfe19da5b5ebbe3c42d08c000e6ac;p=dak.git diff --git a/katie.py b/katie.py index 24647778..876e2f37 100644 --- a/katie.py +++ b/katie.py @@ -2,7 +2,7 @@ # Utility functions for katie # Copyright (C) 2001 James Troup -# $Id: katie.py,v 1.3 2002-02-15 02:54:22 troup Exp $ +# $Id: katie.py,v 1.11 2002-03-14 14:12:04 ajt 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, time; import utils, db_access; import apt_inst, apt_pkg; @@ -158,14 +158,15 @@ class Katie: ## 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): + for i in [ "changed-by", "maintainer822", "filecontents", "format" ]: + 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 @@ -415,7 +416,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,7 +427,8 @@ 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); + ########################################################################### @@ -456,6 +458,7 @@ class Katie: Subst["__CC__"] = "X-Katie-Rejection: automatic (moo)"; os.write(fd, reject_message); os.close(fd); + reject_mail_message = utils.TemplateSubst(Subst,utils.open_file(Cnf["Dir::TemplatesDir"]+"/katie.rejected").read()); else: # Build up the rejection email user_email_address = utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"]); @@ -476,10 +479,10 @@ class Katie: result = os.system("%s +6 %s" % (editor, reject_filename)) if result != 0: utils.fubar("editor invocation failed for '%s'!" % (reject_filename), result); + reject_mail_message = utils.open_file(reject_filename).read(); # 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]); @@ -562,7 +565,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 +582,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 +606,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,6 +622,7 @@ 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"]); @@ -632,7 +640,7 @@ class Katie: # -- ajk@ on d-devel@l.d.o if q.getresult() != []: - reject("can not overwrite existing copy of '%s' already in the archive." % (dsc_file)); + 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 +677,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::QueueUncheckedDir"],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%sDir" % (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;