X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisa;h=724360a8aeeaa6c4f49852de01f7780a5d1d4377;hb=30b41506a6105ab23a0cac9e8197475a89236224;hp=a31cc2445e1b531c5bfd22218dd17d4a46779cb2;hpb=21c699d84af494768593a6d2b5689d6f2792b8c8;p=dak.git

diff --git a/lisa b/lisa
index a31cc244..724360a8 100755
--- 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.4 2002-02-22 02:20:06 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
@@ -53,12 +53,12 @@
 
 ################################################################################
 
-import errno, os, readline, string, stat, sys, tempfile;
+import copy, errno, os, readline, string, stat, sys, tempfile;
 import apt_pkg, apt_inst;
 import db_access, fernanda, katie, logging, utils;
 
 # Globals
-lisa_version = "$Revision: 1.4 $";
+lisa_version = "$Revision: 1.10 $";
 
 Cnf = None;
 Options = None;
@@ -113,7 +113,7 @@ def determine_new (changes, files):
         if f.has_key("othercomponents"):
             new[pkg]["othercomponents"] = f["othercomponents"];
 
-    for suite in changes["distribution"].keys():
+    for suite in changes["suite"].keys():
         suite_id = db_access.get_suite_id(suite);
         for pkg in new.keys():
             component_id = db_access.get_component_id(new[pkg]["component"]);
@@ -126,7 +126,7 @@ def determine_new (changes, files):
                         del files[file]["new"];
                 del new[pkg];
 
-    if changes["distribution"].has_key("stable"):
+    if changes["suite"].has_key("stable"):
         print "WARNING: overrides will be added for stable!";
     for pkg in new.keys():
         if new[pkg].has_key("othercomponents"):
@@ -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,"");
 
 ################################################################################
@@ -495,7 +495,7 @@ def add_overrides (new):
     files = Katie.pkg.files;
 
     projectB.query("BEGIN WORK");
-    for suite in changes["distribution"].keys():
+    for suite in changes["suite"].keys():
         suite_id = db_access.get_suite_id(suite);
         for pkg in new.keys():
             component_id = db_access.get_component_id(new[pkg]["component"]);
@@ -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();
 
 ################################################################################
@@ -520,14 +520,17 @@ def do_new():
     files = Katie.pkg.files;
     changes = Katie.pkg.changes;
 
+    # Make a copy of distribution we can happily trample on
+    changes["suite"] = copy.copy(changes["distribution"]);
+
     # Fix up the list of target suites
-    for suite in changes["distribution"].keys():
+    for suite in changes["suite"].keys():
         override = Cnf.Find("Suite::%s::OverrideSuite" % (suite));
         if override:
-            del changes["distribution"][suite];
-            changes["distribution"][override] = 1;
+            del changes["suite"][suite];
+            changes["suite"][override] = 1;
     # Validate suites
-    for suite in changes["distribution"].keys():
+    for suite in changes["suite"].keys():
         suite_id = db_access.get_suite_id(suite);
         if suite_id == -1:
             utils.fubar("%s has invalid suite '%s' (possibly overriden).  say wha?" % (changes, suite));
@@ -569,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':
@@ -749,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:
+        changes_file = utils.validate_changes_file_arg(changes_file, 0);
+        if not changes_file:
+            continue;
         print "\n" + changes_file;
         do_pkg (changes_file);