# 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.10 2003-07-29 14:00:39 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
###############################################################################
# Globals
-kelly_version = "$Revision: 1.7 $";
+kelly_version = "$Revision: 1.10 $";
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]);
###############################################################################
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