X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=kelly;h=12bcb5a3ba10982783224ef154fb1faddedbda25;hb=dd0ee5b67c650470139ffa8a50ae6b83a92ca76a;hp=68d59a0b4e66ad28d4479db39be697870c2bb54b;hpb=9e78deadeefb78533360179077669f763f0f483c;p=dak.git

diff --git a/kelly b/kelly
index 68d59a0b..12bcb5a3 100755
--- a/kelly
+++ b/kelly
@@ -2,7 +2,7 @@
 
 # Installs Debian packages from queue/accepted into the pool
 # Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
-# $Id: kelly,v 1.15 2005-01-14 14:07:17 ajt Exp $
+# $Id: kelly,v 1.16 2005-11-15 09:50:32 ajt 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
@@ -37,7 +37,7 @@ import db_access, katie, logging, utils;
 ###############################################################################
 
 # Globals
-kelly_version = "$Revision: 1.15 $";
+kelly_version = "$Revision: 1.16 $";
 
 Cnf = None;
 Options = None;
@@ -107,6 +107,8 @@ def reject (str, prefix="Rejected: "):
 # frozen between accept and our run time.
 
 def check():
+    propogate={}
+    nopropogate={}
     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.
@@ -129,6 +131,20 @@ def check():
                 (reject_msg, is_in_incoming) = Katie.check_dsc_against_db(file);
                 reject(reject_msg, "");
 
+        # propogate in the case it is in the override tables:
+        if changes.has_key("propdistribution"):
+            for suite in changes["propdistribution"].keys():
+		if Katie.in_override_p(files[file]["package"], files[file]["component"], suite, files[file].get("dbtype",""), file):
+		    propogate[suite] = 1
+		else:
+		    nopropogate[suite] = 1
+
+    for suite in propogate.keys():
+	if suite in nopropogate:
+	    continue
+	changes["distribution"][suite] = 1
+
+    for file in files.keys():
         # Check the package is still in the override tables
         for suite in changes["distribution"].keys():
             if not Katie.in_override_p(files[file]["package"], files[file]["component"], suite, files[file].get("dbtype",""), file):