X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=kelly;h=78d4519d4efa941079dd18ec3975e9fe7d663cfc;hb=65f7502a0f386b0405b36f1c3dbcb93e0e102980;hp=054988a2ffb94038d55942417a42abd21b0e4d4c;hpb=7508a8d32516ea2123be828cdf204675c2d326f9;p=dak.git

diff --git a/kelly b/kelly
index 054988a2..78d4519d 100755
--- 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.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
@@ -39,7 +39,7 @@ import db_access, katie, logging, utils;
 ###############################################################################
 
 # Globals
-kelly_version = "$Revision: 1.7 $";
+kelly_version = "$Revision: 1.12 $";
 
 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
@@ -245,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]);
 
 ###############################################################################
@@ -390,11 +394,10 @@ def install ():
     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:
@@ -511,7 +514,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
@@ -581,7 +584,7 @@ def main():
                 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);