move arches_compare to utils

diff --git a/madison b/madison
index 34532c8ddeb1963d7f6c1f93be3e4d40de1b30a9..445e29682b9fe69bc24ba6872d17e3efb8c7af58 100755 (executable)
--- 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.21 2002-10-16 02:47:32 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
@@ -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).
@@ -143,7 +131,7 @@ def main ():
                 for suite in suites:
                     sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite));
                     arches = d[pkg][version][suite];
-                    arches.sort(arch_compare);
+                    arches.sort(utils.arch_compare_sw);
                     sys.stdout.write(", ".join(arches));
                     sys.stdout.write('\n');
 

diff --git a/utils.py b/utils.py
index f680a352580e7b0d9ba9a1141cb5dbc055ff879c..f8ef92acaf3bd1d0c8b71c52a33f89949b510f13 100644 (file)
--- a/utils.py
+++ b/utils.py
@@ -2,7 +2,7 @@
 
 # Utility functions
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.53 2002-11-26 15:49:16 troup Exp $
+# $Id: utils.py,v 1.54 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
@@ -653,6 +653,21 @@ def try_with_debug(function):
 
 ################################################################################
 
+# Function for use in sorting lists of architectures.
+# Sorts normally except that 'source' dominates all others.
+
+def arch_compare_sw (a, b):
+    if a == "source" and b == "source":
+        return 0;
+    elif a == "source":
+        return -1;
+    elif b == "source":
+        return 1;
+
+    return cmp (a, b);
+
+################################################################################
+
 apt_pkg.init()
 
 Cnf = apt_pkg.newConfiguration();