X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.py;h=776310ddd73be779815dc93bfe721fbe01918b51;hb=47996bac016067f8b97ebff3d394a999d8979802;hp=a55fe4374f7c7a13f183493c294a068230f908fc;hpb=65f7502a0f386b0405b36f1c3dbcb93e0e102980;p=dak.git

diff --git a/katie.py b/katie.py
index a55fe437..776310dd 100644
--- a/katie.py
+++ b/katie.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Utility functions for katie
-# Copyright (C) 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.42 2003-10-29 16:57:44 troup Exp $
+# Copyright (C) 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $Id: katie.py,v 1.44 2004-02-27 20:07:40 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
@@ -93,7 +93,6 @@ class Katie:
 
     def __init__(self, Cnf):
         self.Cnf = Cnf;
-        self.values = {};
         # Read in the group-maint override file
         self.nmu = nmu_p(Cnf);
         self.accept_count = 0;
@@ -469,7 +468,9 @@ distribution.""";
             return;
 
         summary = "";
-        for file in files.keys():
+        file_keys = files.keys();
+        file_keys.sort();
+        for file in file_keys:
             if not files[file].has_key("new") and files[file]["type"] == "deb":
                 section = files[file]["section"];
                 override_section = files[file]["override section"];
@@ -644,17 +645,17 @@ distribution.""";
             ql = map(lambda x: x[0], q.getresult());
 
             # Try (1)
-            if ql.count(source_version):
+            if source_version in ql:
                 continue
 
             # Try (2)
             orig_source_version = re_bin_only_nmu_of_mu.sub('', source_version)
-            if ql.count(orig_source_version):
+            if orig_source_version in ql:
                 continue
 
             # Try (3)
             orig_source_version = re_bin_only_nmu_of_nmu.sub('', source_version)
-            if ql.count(orig_source_version):
+            if orig_source_version in ql:
                 continue
 
             # No source found...