From 5f1c041b6360046ba2a6cdd3fa41ddaac036d7a3 Mon Sep 17 00:00:00 2001 From: James Troup Date: Mon, 17 Sep 2001 11:18:37 +0000 Subject: [PATCH] Move result_join() to utils; add an optional seperator argument; use it in natalie --- denise | 19 +++++-------------- natalie.py | 9 +++------ utils.py | 13 ++++++++++++- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/denise b/denise index a6772c39..7d7ed102 100755 --- a/denise +++ b/denise @@ -2,7 +2,7 @@ # Output override files for apt-ftparchive and indices/ # Copyright (C) 2000, 2001 James Troup -# $Id: denise,v 1.7 2001-09-13 23:51:51 troup Exp $ +# $Id: denise,v 1.8 2001-09-17 11:18: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 @@ -36,15 +36,6 @@ override = {} ################################################################################ -def result_join (original): - list = []; - for i in xrange(len(original)): - if original[i] == None: - list.append(""); - else: - list.append(original[i]); - return string.join(list, '\t'); - def list(suite, component, type): global override; @@ -71,13 +62,13 @@ def list(suite, component, type): q = projectB.query("SELECT o.package, s.section, o.maintainer FROM override o, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.section = s.id ORDER BY s.section, o.package" % (suite_id, component_id, type_id)); for i in q.getresult(): override[suite][component][type][i[0]] = i; - print result_join(i); + print utils.result_join(i); else: q = projectB.query("SELECT o.package, p.priority, s.section, o.maintainer, p.level FROM override o, priority p, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.priority = p.id AND o.section = s.id ORDER BY s.section, p.level, o.package" % (suite_id, component_id, type_id)); for i in q.getresult(): i = i[:-1]; # Strip the priority level override[suite][component][type][i[0]] = i; - print result_join(i); + print utils.result_join(i); ################################################################################ @@ -145,9 +136,9 @@ def main (): for i in q.getresult(): package = i[0]; if override["unstable"][component][type].has_key(package): - print result_join(override["unstable"][component][type][package]); + print utils.result_join(override["unstable"][component][type][package]); elif override["stable"][component][type].has_key(package): - print result_join(override["stable"][component][type][package]); + print utils.result_join(override["stable"][component][type][package]); else: if type == "dsc" and (override["unstable"][component]["deb"].has_key(package) or override["stable"][component]["deb"].has_key(package)): continue; # source falls back on binary; so accept silently diff --git a/natalie.py b/natalie.py index 47c1410b..b37378ce 100755 --- a/natalie.py +++ b/natalie.py @@ -2,7 +2,7 @@ # Manipulate override files # Copyright (C) 2000, 2001 James Troup -# $Id: natalie.py,v 1.9 2001-09-13 23:51:51 troup Exp $ +# $Id: natalie.py,v 1.10 2001-09-17 11:18: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 @@ -196,14 +196,11 @@ def list(suite, component, type): if type == "dsc": q = projectB.query("SELECT o.package, s.section, o.maintainer FROM override o, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.section = s.id ORDER BY s.section, o.package" % (suite_id, component_id, type_id)); for i in q.getresult(): - print string.join(i, '\t'); + print utils.result_join(i); else: q = projectB.query("SELECT o.package, p.priority, s.section, o.maintainer, p.level FROM override o, priority p, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.priority = p.id AND o.section = s.id ORDER BY s.section, p.level, o.package" % (suite_id, component_id, type_id)); for i in q.getresult(): - if ( i[-2] ): - print string.join(i[:-1], '\t'); - else: - print string.join(i[:-2], '\t'); + print utils.result_join(i[:-1]); ################################################################################ diff --git a/utils.py b/utils.py index 814a21d8..2de33f1e 100644 --- a/utils.py +++ b/utils.py @@ -1,6 +1,6 @@ # Utility functions # Copyright (C) 2000, 2001 James Troup -# $Id: utils.py,v 1.31 2001-09-13 23:52:37 troup Exp $ +# $Id: utils.py,v 1.32 2001-09-17 11:18: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 @@ -505,3 +505,14 @@ def find_next_free (dest, too_many=100): return dest; ################################################################################ + +def result_join (original, sep = '\t'): + list = []; + for i in xrange(len(original)): + if original[i] == None: + list.append(""); + else: + list.append(original[i]); + return string.join(list, sep); + +################################################################################ -- 2.39.5