# Installs Debian packages
# Copyright (C) 2000, 2001, 2002, 2003 James Troup <james@nocrew.org>
-# $Id: kelly,v 1.7 2003-02-21 19:19:33 troup Exp $
+# $Id: kelly,v 1.12 2003-09-24 00:13:43 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
###############################################################################
# Globals
-kelly_version = "$Revision: 1.7 $";
+kelly_version = "$Revision: 1.12 $";
Cnf = None;
Options = None;
def check():
for file in files.keys():
+ # The .orig.tar.gz can disappear out from under us is it's a
+ # duplicate of one in the archive.
+ if not files.has_key(file):
+ continue;
# Check that the source still exists
if files[file]["type"] == "deb":
source_version = files[file]["source version"];
source_package = files[file]["source package"];
if not changes["architecture"].has_key("source") \
- and not Katie.source_exists(source_package, source_version):
+ and not Katie.source_exists(source_package, source_version, changes["distribution"].keys()):
reject("no source found for %s %s (%s)." % (source_package, source_version, file));
# Version and file overwrite checks
os.write(fd, reject_mail_message);
os.close(fd);
- utils.send_mail (reject_mail_message, "");
+ utils.send_mail(reject_mail_message);
Logger.log(["unaccepted", pkg.changes_file]);
###############################################################################
projectB.query("COMMIT WORK");
# Move the .changes into the 'done' directory
- try:
- utils.move (pkg.changes_file, os.path.join(Cnf["Dir::Queue::Done"], os.path.basename(pkg.changes_file)));
- except:
- utils.warn("couldn't move changes file '%s' to DONE directory. [Got %s]" % (os.path.basename(pkg.changes_file), sys.exc_type));
+ utils.move (pkg.changes_file,
+ os.path.join(Cnf["Dir::Queue::Done"], os.path.basename(pkg.changes_file)));
+ # Remove the .katie file
os.unlink(Katie.pkg.changes_file[:-8]+".katie");
if changes["architecture"].has_key("source") and Urgency_Logger:
Subst["__SUITE__"] = " into stable";
Subst["__SUMMARY__"] = summary;
mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/kelly.installed");
- utils.send_mail(mail_message, "");
+ utils.send_mail(mail_message);
Katie.announce(short_summary, 1)
# Finally remove the .katie file
utils.fubar("Couldn't obtain lock; assuming another kelly is already running.");
else:
raise;
- Logger = Katie.Logger = logging.Logger(Cnf, "katie");
+ Logger = Katie.Logger = logging.Logger(Cnf, "kelly");
if not installing_to_stable and Cnf.get("Dir::UrgencyLog"):
Urgency_Logger = Urgency_Log(Cnf);