Log as kelly in kelly. Don't duplicate bug close log msgs in katie.py.

diff --git a/katie.py b/katie.py
index 3de932a1c46ddba9a3d41c0de7b6a1df51c7c94f..55e49e08f00e446c1a28c58f8e90cff65c61a538 100644 (file)
--- a/katie.py
+++ b/katie.py
@@ -2,7 +2,7 @@
 
 # Utility functions for katie
 # Copyright (C) 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.39 2003-09-16 20:41:21 troup Exp $
+# $Id: katie.py,v 1.40 2003-09-17 23:36:17 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
@@ -325,8 +325,8 @@ distribution.""";
                            Subst["__STABLE_WARNING__"] = "";
                            mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.bug-close");
                            utils.send_mail (mail_message);
-                       if action:
-                           self.Logger.log(["closing bugs"]+bugs);
+                if action:
+                    self.Logger.log(["closing bugs"]+bugs);
 
        else:                     # NMU
             summary += "Setting bugs to severity fixed: ";

diff --git a/kelly b/kelly
index 37b6db47eaad63ad268f13a8dfa04ea93fa7f968..b9f02911cd36ce202bad43625203b29a3e77ad86 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.10 2003-07-29 14:00:39 ajt Exp $
+# $Id: kelly,v 1.11 2003-09-17 23:36:17 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.11 $";
 
 Cnf = None;
 Options = None;
@@ -585,7 +585,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);