two bug fixes in source_exists changes

[dak.git] / kelly

diff --git a/kelly b/kelly
index 2d0e2623103f76954aa70d49bf0e8510e5f2cafe..37b6db47eaad63ad268f13a8dfa04ea93fa7f968 100755 (executable)
--- a/kelly
+++ b/kelly
@@ -2,7 +2,7 @@
 
 # Installs Debian packages
 # Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: kelly,v 1.6 2003-02-11 19:39:25 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
@@ -39,7 +39,7 @@ import db_access, katie, logging, utils;
 ###############################################################################
 
 # Globals
-kelly_version = "$Revision: 1.6 $";
+kelly_version = "$Revision: 1.10 $";
 
 Cnf = None;
 Options = None;
@@ -110,12 +110,16 @@ def reject (str, prefix="Rejected: "):
 
 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
@@ -141,14 +145,12 @@ def init():
 
     Arguments = [('a',"automatic","Dinstall::Options::Automatic"),
                  ('h',"help","Dinstall::Options::Help"),
-                 ('m',"manual-reject","Dinstall::Options::Manual-Reject", "HasArg"),
                  ('n',"no-action","Dinstall::Options::No-Action"),
                  ('p',"no-lock", "Dinstall::Options::No-Lock"),
                  ('s',"no-mail", "Dinstall::Options::No-Mail"),
                  ('V',"version","Dinstall::Options::Version")];
 
-    for i in ["automatic", "help", "manual-reject", "no-action",
-              "no-lock", "no-mail", "version"]:
+    for i in ["automatic", "help", "no-action", "no-lock", "no-mail", "version"]:
        if not Cnf.has_key("Dinstall::Options::%s" % (i)):
            Cnf["Dinstall::Options::%s" % (i)] = "";
 
@@ -247,7 +249,7 @@ def do_reject ():
     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]);
 
 ###############################################################################
@@ -513,7 +515,7 @@ def stable_install (summary, short_summary):
         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
@@ -593,8 +595,6 @@ def main():
         Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else:
         Subst["__BCC__"] = bcc;
-    if Cnf.has_key("Dinstall::StableRejector"):
-        Subst["__STABLE_REJECTOR__"] = Cnf["Dinstall::StableRejector"];
 
     # Sort the .changes files so that we process sourceful ones first
     changes_files.sort(utils.changes_compare);