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

diff --git a/kelly b/kelly
index 69fc3194..12bcb5a3 100755
--- a/kelly
+++ b/kelly
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Installs Debian packages from queue/accepted into the pool
-# Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: kelly,v 1.13 2003-11-07 01:48:38 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $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.13 $";
+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.
@@ -123,12 +125,26 @@ def check():
         # Version and file overwrite checks
         if not installing_to_stable:
             if files[file]["type"] == "deb":
-                reject(Katie.check_binary_against_db(file));
+                reject(Katie.check_binary_against_db(file), "");
             elif files[file]["type"] == "dsc":
-                reject(Katie.check_source_against_db(file));
+                reject(Katie.check_source_against_db(file), "");
                 (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):
@@ -334,7 +350,7 @@ def install ():
     orig_tar_id = Katie.pkg.orig_tar_id;
     orig_tar_location = Katie.pkg.orig_tar_location;
     legacy_source_untouchable = Katie.pkg.legacy_source_untouchable;
-    if orig_tar_id != None and orig_tar_location == "legacy":
+    if orig_tar_id and orig_tar_location == "legacy":
         q = projectB.query("SELECT DISTINCT ON (f.id) l.path, f.filename, f.id as files_id, df.source, df.id as dsc_files_id, f.size, f.md5sum FROM files f, dsc_files df, location l WHERE df.source IN (SELECT source FROM dsc_files WHERE file = %s) AND f.id = df.file AND l.id = f.location AND (l.type = 'legacy' OR l.type = 'legacy-mixed')" % (orig_tar_id));
         qd = q.dictresult();
         for qid in qd:
@@ -354,7 +370,7 @@ def install ():
     # cross-component we need to copy the .orig.tar.gz into the new
     # component too for the same reasons as above.
     #
-    if changes["architecture"].has_key("source") and orig_tar_id != None and \
+    if changes["architecture"].has_key("source") and orig_tar_id and \
        orig_tar_location != "legacy" and orig_tar_location != dsc_location_id:
         q = projectB.query("SELECT l.path, f.filename, f.size, f.md5sum FROM files f, location l WHERE f.id = %s AND f.location = l.id" % (orig_tar_id));
         ql = q.getresult()[0];
@@ -492,7 +508,7 @@ def stable_install (summary, short_summary):
     for file in files.keys():
         if files[file]["type"] == "deb":
             new_changelog.write("stable/%s/binary-%s/%s\n" % (files[file]["component"], files[file]["architecture"], file));
-        elif utils.re_issource.match(file) != None:
+        elif utils.re_issource.match(file):
             new_changelog.write("stable/%s/source/%s\n" % (files[file]["component"], file));
         else:
             new_changelog.write("%s\n" % (file));