X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=madison;h=445e29682b9fe69bc24ba6872d17e3efb8c7af58;hb=ab9a8e8058315ff4ab4e0f17b13afce00192ec2c;hp=39a389dc847bfd92e0e0cc23d583c9f7ae5200b7;hpb=f4a1c7be4eed509abd330f5b850a88bb699cabfc;p=dak.git

diff --git a/madison b/madison
index 39a389dc..445e2968 100755
--- a/madison
+++ b/madison
@@ -2,7 +2,7 @@
 
 # Display information about package(s) (suite, version, etc.)
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: madison,v 1.20 2002-07-14 15:02:07 troup Exp $
+# $Id: madison,v 1.22 2002-12-08 17:25:17 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
@@ -27,7 +27,7 @@
 
 ################################################################################
 
-import pg, string, sys;
+import pg, sys;
 import utils, db_access;
 import apt_pkg;
 
@@ -38,18 +38,6 @@ projectB = None;
 
 ################################################################################
 
-def arch_compare (a, b):
-    if a == "source" and b == "source":
-        return 0;
-    elif a == "source":
-        return -1;
-    elif b == "source":
-        return 1;
-
-    return cmp (a, b);
-
-################################################################################
-
 def usage (exit_code=0):
     print """Usage: madison [OPTION] PACKAGE[...]
 Display information about PACKAGE(s).
@@ -119,7 +107,7 @@ def main ():
             ql.extend(q.getresult());
         d = {};
         for i in ql:
-            results = results + 1;
+            results += 1;
             pkg = i[0];
             version = i[1];
             architecture = i[2];
@@ -143,8 +131,8 @@ def main ():
                 for suite in suites:
                     sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite));
                     arches = d[pkg][version][suite];
-                    arches.sort(arch_compare);
-                    sys.stdout.write(string.join(arches, ", "));
+                    arches.sort(utils.arch_compare_sw);
+                    sys.stdout.write(", ".join(arches));
                     sys.stdout.write('\n');
 
     if not results: