# Utility functions for katie
# Copyright (C) 2001 James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.6 2002-02-15 22:27:27 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
###############################################################################
-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;
# 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:
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);
+
###########################################################################
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"]);
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]);
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 = "";
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:
- self.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() != []:
dsc_files = self.pkg.dsc_files;
legacy_source_untouchable = self.pkg.legacy_source_untouchable;
orig_tar_gz = None;
- found = None;
# Try and find all files mentioned in the .dsc. This has
# 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"]);
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;