new .debs must be newer versions than arch: all versions too.

diff --git a/TODO b/TODO
index cd228b3eb5a7f0e888c9b1eb1b727abbb85fecac..d15fc4fe8009c0cb802d3a14e073240a1c023036 100644 (file)
--- a/TODO
+++ b/TODO
@@ -14,9 +14,6 @@ More Urgent
       table.  Then fix charisma to use them and write some scripting
       to handle the Santiago situation. ]
 
-  o katie's version check should include arch: all packages; see
-    #104087.
-
 Less Urgent
 -----------
 

diff --git a/katie b/katie
index 05ca46ee8c0813e18dca3cbf0ffbad3a018b5d75..6f5f9cf45005fdc99b0af536849c3b44d08a8211 100755 (executable)
--- a/katie
+++ b/katie
@@ -2,7 +2,7 @@
 
 # Installs Debian packaes
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: katie,v 1.53 2001-07-13 15:54:59 troup Exp $
+# $Id: katie,v 1.54 2001-07-13 16:01:37 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
@@ -475,7 +475,7 @@ def check_files():
                 
             if files[file]["type"] == "deb":
                 # Find any old binary packages
-                q = projectB.query("SELECT b.id, b.version, f.filename, l.path, c.name FROM binaries b, bin_associations ba, suite s, location l, component c, architecture a, files f WHERE b.package = '%s' AND s.suite_name = '%s' AND a.arch_string = '%s' AND ba.bin = b.id AND ba.suite = s.id AND b.architecture = a.id AND f.location = l.id AND l.component = c.id AND b.file = f.id"
+                q = projectB.query("SELECT b.id, b.version, f.filename, l.path, c.name FROM binaries b, bin_associations ba, suite s, location l, component c, architecture a, files f WHERE b.package = '%s' AND s.suite_name = '%s' AND (a.arch_string = '%s' OR a.arch_string = 'all') AND ba.bin = b.id AND ba.suite = s.id AND b.architecture = a.id AND f.location = l.id AND l.component = c.id AND b.file = f.id"
                                    % (files[file]["package"], suite, files[file]["architecture"]))
                 oldfiles = q.dictresult()
                 for oldfile in oldfiles:
@@ -1366,7 +1366,7 @@ def main():
     Subst = {}
     Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];
     Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"];
-    bcc = "X-Katie: $Revision: 1.53 $"
+    bcc = "X-Katie: $Revision: 1.54 $"
     if Cnf.has_key("Dinstall::Bcc"):
         Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else: