X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=kelly;h=69fc31941f8073da8c2c127b17bde1433b3068f6;hb=9025ea49a87b5e8e63190e45fc033d43d53c888a;hp=0afc83573a52011b612bfa620b67f4d55b1c396e;hpb=711a3b8e78e09ea4c2de077a694dbac8a02cd715;p=dak.git

diff --git a/kelly b/kelly
index 0afc8357..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.9 2003-07-15 17:29:22 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.9 $";
+kelly_version = "$Revision: 1.13 $";
 
 Cnf = None;
 Options = None;
@@ -119,7 +117,7 @@ def check():
             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
@@ -275,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)
@@ -311,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;
@@ -394,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:
@@ -585,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);