X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lisa;h=1467b0e9a29354bf18145566f426bf132ccfd87e;hb=e6f9691c67b50f990263c71b71e471b6a00dcb9f;hp=d7e73cfb7dbf817c4357a391381fd55efc387f1c;hpb=97908569f7d9bdb774006bf58e0ca704ca05a32b;p=dak.git

diff --git a/lisa b/lisa
index d7e73cfb..1467b0e9 100755
--- a/lisa
+++ b/lisa
@@ -2,7 +2,7 @@
 
 # Handles NEW and BYHAND packages
 # Copyright (C) 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: lisa,v 1.21 2003-02-11 19:39:28 troup Exp $
+# $Id: lisa,v 1.26 2003-11-17 17:59:26 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
@@ -42,7 +42,7 @@ import apt_pkg, apt_inst;
 import db_access, fernanda, katie, logging, utils;
 
 # Globals
-lisa_version = "$Revision: 1.21 $";
+lisa_version = "$Revision: 1.26 $";
 
 Cnf = None;
 Options = None;
@@ -70,12 +70,16 @@ def recheck():
     reject_message = "";
 
     for file in files.keys():
+        # The .orig.tar.gz can disappear out from under us is it's a
+        # duplicate of one in the archive.
+        if not files.has_key(file):
+            continue;
         # Check that the source still exists
         if files[file]["type"] == "deb":
             source_version = files[file]["source version"];
             source_package = files[file]["source package"];
             if not Katie.pkg.changes["architecture"].has_key("source") \
-               and not Katie.source_exists(source_package, source_version):
+               and not Katie.source_exists(source_package, source_version, Katie.pkg.changes["distribution"].keys()):
                 source_epochless_version = utils.re_no_epoch.sub('', source_version);
                 dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version);
                 if not os.path.exists(Cnf["Dir::Queue::Accepted"] + '/' + dsc_filename):
@@ -172,6 +176,8 @@ def determine_new (changes, files):
 
     if changes["suite"].has_key("stable"):
         print "WARNING: overrides will be added for stable!";
+    if changes["suite"].has_key("oldstable"):
+        print "WARNING: overrides will be added for OLDstable!";
     for pkg in new.keys():
         if new[pkg].has_key("othercomponents"):
             print "WARNING: %s already present in %s distribution." % (pkg, new[pkg]["othercomponents"]);
@@ -611,7 +617,7 @@ def do_bxa_notification():
             summary += "Description: %s\n" % (control.Find("Description"));
     Katie.Subst["__BINARY_DESCRIPTIONS__"] = summary;
     bxa_mail = utils.TemplateSubst(Katie.Subst,Cnf["Dir::Templates"]+"/lisa.bxa_notification");
-    utils.send_mail(bxa_mail,"");
+    utils.send_mail(bxa_mail);
 
 ################################################################################