From 57c788ad1fdcb514731a973e3aa5cdfbf7a6c19e Mon Sep 17 00:00:00 2001 From: James Troup Date: Sun, 8 Dec 2002 17:25:17 +0000 Subject: [PATCH] move arches_compare to utils --- madison | 16 ++-------------- utils.py | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/madison b/madison index 34532c8d..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 -# $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 f680a352..f8ef92ac 100644 --- a/utils.py +++ b/utils.py @@ -2,7 +2,7 @@ # Utility functions # Copyright (C) 2000, 2001, 2002 James Troup -# $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(); -- 2.39.5