X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lisa;h=e17666e87cf838172a138ed5c1b742c252780b29;hb=336e084aeebe6c6c6f07b8c9172a7fe8fb93487f;hp=c1d8b0a9d1f6b8c4ba5c1e303be6dc56d7b61827;hpb=699462cf1b150b68161349a6593b12512b65d39d;p=dak.git

diff --git a/lisa b/lisa
index c1d8b0a9..e17666e8 100755
--- 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.6 2002-04-16 14:47:12 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.6 $";
+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':
@@ -759,6 +760,9 @@ def main():
         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);