X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=kelly;h=78d4519d4efa941079dd18ec3975e9fe7d663cfc;hb=65f7502a0f386b0405b36f1c3dbcb93e0e102980;hp=37b6db47eaad63ad268f13a8dfa04ea93fa7f968;hpb=2d5a651910c9084ec4c6e3656dfb0d4d51b6bcc2;p=dak.git

diff --git a/kelly b/kelly
index 37b6db47..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.10 2003-07-29 14:00:39 ajt 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.10 $";
+kelly_version = "$Revision: 1.12 $";
 
 Cnf = None;
 Options = None;
@@ -394,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:
@@ -585,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);