sync

[dak.git] / lisa

diff --git a/lisa b/lisa
index 47289220e8907654e89df3b87c3467b9b0b27680..724360a8aeeaa6c4f49852de01f7780a5d1d4377 100755 (executable)
--- a/lisa
+++ b/lisa
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Handles NEW and BYHAND packages
-# Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: lisa,v 1.7 2002-04-20 13:13:15 troup Exp $
+# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
+# $Id: lisa,v 1.10 2002-05-10 00:24:23 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.7 $";
+lisa_version = "$Revision: 1.10 $";
 
 Cnf = None;
 Options = None;
@@ -485,7 +485,7 @@ def do_bxa_notification():
             summary = summary + "Package: %s\n" % (control.Find("Package"));
             summary = summary + "Description: %s\n" % (control.Find("Description"));
     Katie.Subst["__BINARY_DESCRIPTIONS__"] = summary;
-    bxa_mail = utils.TemplateSubst(Katie.Subst,open(Cnf["Dir::TemplatesDir"]+"/lisa.bxa_notification","r").read());
+    bxa_mail = utils.TemplateSubst(Katie.Subst,Cnf["Dir::Templates"]+"/lisa.bxa_notification");
     utils.send_mail(bxa_mail,"");
 
 ################################################################################
@@ -510,7 +510,7 @@ def add_overrides (new):
 
     projectB.query("COMMIT WORK");
 
-    if Cnf.FindI("Dinstall::BXANotify"):
+    if Cnf.FindB("Dinstall::BXANotify"):
         do_bxa_notification();
 
 ################################################################################
@@ -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,8 +760,8 @@ 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);
+        changes_file = utils.validate_changes_file_arg(changes_file, 0);
+        if not changes_file:
             continue;
         print "\n" + changes_file;
         do_pkg (changes_file);