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

diff --git a/kelly b/kelly
index 054988a2..69fc3194 100755
--- a/kelly
+++ b/kelly
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-# Installs Debian packages
+# Installs Debian packages from queue/accepted into the pool
 # 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.13 2003-11-07 01:48:38 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
@@ -18,8 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# Originally based on dinstall by Guy Maor <maor@debian.org>
-
 ###############################################################################
 
 #    Cartman: "I'm trying to make the best of a bad situation, I don't
@@ -32,14 +30,14 @@
 
 ###############################################################################
 
-import fcntl, os, sys, time;
+import errno, fcntl, os, sys, time;
 import apt_pkg;
 import db_access, katie, logging, utils;
 
 ###############################################################################
 
 # Globals
-kelly_version = "$Revision: 1.7 $";
+kelly_version = "$Revision: 1.13 $";
 
 Cnf = None;
 Options = None;
@@ -110,12 +108,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 +247,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]);
 
 ###############################################################################
@@ -271,6 +273,7 @@ def install ():
             fingerprint_id = db_access.get_or_set_fingerprint_id(dsc["fingerprint"]);
             install_date = time.strftime("%Y-%m-%d");
             filename = files[file]["pool name"] + file;
+            dsc_component = files[file]["component"];
             dsc_location_id = files[file]["location id"];
             if not files[file].has_key("files id") or not files[file]["files id"]:
                 files[file]["files id"] = db_access.set_files_id (filename, files[file]["size"], files[file]["md5sum"], dsc_location_id)
@@ -307,7 +310,6 @@ def install ():
             architecture = files[file]["architecture"]
             architecture_id = db_access.get_architecture_id (architecture);
             type = files[file]["dbtype"];
-            dsc_component = files[file]["component"]
             source = files[file]["source package"]
             source_version = files[file]["source version"];
             filename = files[file]["pool name"] + file;
@@ -390,11 +392,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 +512,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 +582,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);