#!/usr/bin/env python
# Utility functions for katie
-# Copyright (C) 2001 James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.16 2002-04-24 01:56:24 troup Exp $
+# Copyright (C) 2001, 2002 James Troup <james@nocrew.org>
+# $Id: katie.py,v 1.22 2002-05-19 00:47:07 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
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)));
exec "%s = self.pkg.%s;" % (i,i);
dump_filename = os.path.join(dest_dir,self.pkg.changes_file[:-8] + ".katie");
dump_file = utils.open_file(dump_filename, 'w');
+ try:
+ os.chmod(dump_filename, 0660);
+ except OSError, e:
+ if errno.errorcode[e.errno] == 'EPERM':
+ perms = stat.S_IMODE(os.stat(dump_filename)[stat.ST_MODE]);
+ if perms & stat.S_IROTH:
+ utils.fubar("%s is world readable and chmod failed." % (dump_filename));
+ else:
+ raise;
+
p = cPickle.Pickler(dump_file, 1);
for i in [ "d_changes", "d_dsc", "d_files", "d_dsc_files" ]:
exec "%s = {}" % i;
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", "othercomponents",
+ "pool name" ]:
if files[file].has_key(i):
d_files[file][i] = files[file][i];
## changes
d_changes[i] = changes[i];
# Optional changes fields
# FIXME: changes should be mandatory
- for i in [ "changed-by", "maintainer822", "filecontents", "format", "changes" ]:
+ for i in [ "changed-by", "maintainer822", "filecontents", "format",
+ "changes", "lisa note" ]:
if changes.has_key(i):
d_changes[i] = changes[i];
## dsc
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");
###########################################################################
- 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;
+
+ ###########################################################################
+
+ def announce (self, short_summary, action):
+ Subst = self.Subst;
+ Cnf = self.Cnf;
+ changes = self.pkg.changes;
- return summary
+ # 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;
###########################################################################
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;
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.get("Dinstall::SpecialAcceptedAutoBuild") and \
+ 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::QueueAcceptedDir"], file);
+ 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);
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 = "";
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, "");
###########################################################################
# 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:
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];
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());
+ 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"]);
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 <foo>.reason file
os.write(fd, reject_mail_message);
result = q.getresult();
# Remember the section and priority so we can check them later if appropriate
- if result != []:
+ if result:
files[file]["override section"] = result[0][0];
files[file]["override priority"] = result[0][1];
self.reject_message = self.reject_message + "\n";
self.reject_message = self.reject_message + prefix + str;
- def check_binaries_against_db(self, file, suite):
+ ################################################################################
+
+ def cross_suite_version_check(self, query_result, file, new_version):
+ """Ensure versions are newer than existing packages in target
+ suites and that cross-suite version checking rules as
+ set out in the conf file are satisfied."""
+
+ # Check versions for each target suite
+ for target_suite in self.pkg.changes["distribution"].keys():
+ must_be_newer_than = map(lower, self.Cnf.ValueList("Suite::%s::VersionChecks::MustBeNewerThan" % (target_suite)));
+ must_be_older_than = map(lower, self.Cnf.ValueList("Suite::%s::VersionChecks::MustBeOlderThan" % (target_suite)));
+ # Enforce "must be newer than target suite" even if conffile omits it
+ if target_suite not in must_be_newer_than:
+ must_be_newer_than.append(target_suite);
+ for entry in query_result:
+ existent_version = entry[0];
+ suite = entry[1];
+ if suite in must_be_newer_than and \
+ apt_pkg.VersionCompare(new_version, existent_version) != 1:
+ self.reject("%s: old version (%s) in %s >= new version (%s) targeted at %s." % (file, existent_version, suite, new_version, target_suite));
+ if suite in must_be_older_than and \
+ apt_pkg.VersionCompare(new_version, existent_version) != -1:
+ self.reject("%s: old version (%s) in %s <= new version (%s) targeted at %s." % (file, existent_version, suite, new_version, target_suite));
+
+ ################################################################################
+
+ def check_binary_against_db(self, file):
self.reject_message = "";
files = self.pkg.files;
- # Find any old binary packages
- q = self.projectB.query("SELECT b.id, b.version, f.filename, l.path, c.name FROM binaries b, bin_associations ba, suite s, location l, component c, architecture a, files f WHERE b.package = '%s' AND s.suite_name = '%s' AND (a.arch_string = '%s' OR a.arch_string = 'all') AND ba.bin = b.id AND ba.suite = s.id AND b.architecture = a.id AND f.location = l.id AND l.component = c.id AND b.file = f.id"
- % (files[file]["package"], suite, files[file]["architecture"]))
- for oldfile in q.dictresult():
- 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"]));
+ # Ensure version is sane
+ q = self.projectB.query("""
+SELECT b.version, su.suite_name FROM binaries b, bin_associations ba, suite su,
+ architecture a
+ WHERE b.package = '%s' AND (a.arch_string = '%s' OR a.arch_string = 'all')
+ AND ba.bin = b.id AND ba.suite = su.id AND b.architecture = a.id"""
+ % (files[file]["package"],
+ files[file]["architecture"]));
+ self.cross_suite_version_check(q.getresult(), file, 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() != []:
+ 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():
self.reject("can not overwrite existing copy of '%s' already in the archive." % (file));
return self.reject_message;
################################################################################
def check_source_against_db(self, file):
- """Ensure source is newer than existing source in target suites."""
self.reject_message = "";
- changes = self.pkg.changes;
dsc = self.pkg.dsc;
- package = dsc.get("source");
- new_version = dsc.get("version");
- for suite in changes["distribution"].keys():
- q = self.projectB.query("SELECT s.version FROM source s, src_associations sa, suite su WHERE s.source = '%s' AND su.suite_name = '%s' AND sa.source = s.id AND sa.suite = su.id"
- % (package, suite));
- ql = map(lambda x: x[0], q.getresult());
- for old_version in ql:
- if apt_pkg.VersionCompare(new_version, old_version) != 1:
- self.reject("%s: Old version `%s' >= new version `%s'." % (file, old_version, new_version));
+ # Ensure version is sane
+ q = self.projectB.query("""
+SELECT s.version, su.suite_name FROM source s, src_associations sa, suite su
+ WHERE s.source = '%s' AND sa.source = s.id AND sa.suite = su.id""" % (dsc.get("source")));
+ self.cross_suite_version_check(q.getresult(), file, dsc.get("version"));
+
return self.reject_message;
################################################################################
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
# the same name and version.)"
# -- ajk@ on d-devel@l.d.o
- if q.getresult() != []:
- self.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));
ql = q.getresult();
- if ql != []:
+ if ql:
# Unfortunately, we make get more than one
# match here if, for example, the package was
# in potato but had a -sa upload in woody. So
else:
# Not there? Check the queue directories...
- in_unchecked = os.path.join(self.Cnf["Dir::QueueUncheckedDir"],dsc_file);
+ 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:
for dir in [ "Accepted", "New", "Byhand" ]:
- in_otherdir = os.path.join(self.Cnf["Dir::Queue%sDir" % (dir)],dsc_file);
+ 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];