natalie got renamed

[dak.git] / lisa

diff --git a/lisa b/lisa
index fd40154b08727897bf0f3b9708254921db5204c0..e17666e87cf838172a138ed5c1b742c252780b29 100755 (executable)
--- a/lisa
+++ b/lisa
@@ -2,7 +2,7 @@
 
 # Handles NEW and BYHAND packages
 # Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: lisa,v 1.5 2002-03-26 22:05:47 troup Exp $
+# $Id: lisa,v 1.8 2002-04-21 15:38:54 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
@@ -58,7 +58,7 @@ import apt_pkg, apt_inst;
 import db_access, fernanda, katie, logging, utils;
 
 # Globals
-lisa_version = "$Revision: 1.5 $";
+lisa_version = "$Revision: 1.8 $";
 
 Cnf = None;
 Options = None;
@@ -572,9 +572,10 @@ def do_new():
         elif answer == 'E':
             new = edit_overrides (new);
         elif answer == 'M':
-            Katie.do_reject(1, Options["Manual-Reject"]);
-            os.unlink(Katie.pkg.changes_file[:-8]+".katie");
-            done = 1;
+            aborted = Katie.do_reject(1, Options["Manual-Reject"]);
+            if not aborted:
+                os.unlink(Katie.pkg.changes_file[:-8]+".katie");
+                done = 1;
         elif answer == 'S':
             done = 1;
         elif answer == 'Q':
@@ -752,13 +753,16 @@ def main():
 
     # Kill me now? **FIXME**
     Cnf["Dinstall::Options::No-Mail"] = "";
-    bcc = "X-Lisa: %s" % (lisa_version);
+    bcc = "X-Katie: %s" % (lisa_version);
     if Cnf.has_key("Dinstall::Bcc"):
         Katie.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else:
         Katie.Subst["__BCC__"] = bcc;
 
     for changes_file in changes_files:
+        if not os.path.exists(changes_file):
+            print "\nSkipping %s - file does not exist." % (changes_file);
+            continue;
         print "\n" + changes_file;
         do_pkg (changes_file);