X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_maintainers.py;h=aef7da2fb9af806fa0196759f89d23d2a9cb8a27;hb=4c7eee9642e82b6286f807ad92a93e7ef30288e6;hp=090b8d4337d1dfdc2a3039d34512cce0d54d1c88;hpb=8e60420c69a993a4041c22008dafc2fcb238d0d5;p=dak.git diff --git a/dak/make_maintainers.py b/dak/make_maintainers.py index 090b8d43..aef7da2f 100755 --- a/dak/make_maintainers.py +++ b/dak/make_maintainers.py @@ -1,7 +1,12 @@ #!/usr/bin/env python -# Generate Maintainers file used by e.g. the Debian Bug Tracking System -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006 James Troup +""" +Generate Maintainers file used by e.g. the Debian Bug Tracking System +@contact: Debian FTP Master +@copyright: 2000, 2001, 2002, 2003, 2004, 2006 James Troup +@license: GNU General Public License version 2 or later + +""" # 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 @@ -25,18 +30,20 @@ ################################################################################ -import pg, sys +import sys import apt_pkg -from daklib import database + +from daklib.config import Config +from daklib.dbconn import * from daklib import utils +from daklib import textutils +from daklib.regexes import re_comments ################################################################################ -projectB = None -Cnf = None -maintainer_from_source_cache = {} -packages = {} -fixed_maintainer_cache = {} +maintainer_from_source_cache = {} #: caches the maintainer name per source_id +packages = {} #: packages data to write out +fixed_maintainer_cache = {} #: caches fixed ( L{daklib.textutils.fix_maintainer} ) maintainer data ################################################################################ @@ -51,22 +58,50 @@ Generate an index of packages <=> Maintainers. ################################################################################ def fix_maintainer (maintainer): + """ + Fixup maintainer entry, cache the result. + + @type maintainer: string + @param maintainer: A maintainer entry as passed to L{daklib.textutils.fix_maintainer} + + @rtype: tuple + @returns: fixed maintainer tuple + """ global fixed_maintainer_cache if not fixed_maintainer_cache.has_key(maintainer): - fixed_maintainer_cache[maintainer] = utils.fix_maintainer(maintainer)[0] + fixed_maintainer_cache[maintainer] = textutils.fix_maintainer(maintainer)[0] return fixed_maintainer_cache[maintainer] -def get_maintainer (maintainer): - return fix_maintainer(database.get_maintainer(maintainer)) +def get_maintainer(maintainer, session): + """ + Retrieves maintainer name from database, passes it through fix_maintainer and + passes on whatever that returns. + + @type maintainer: int + @param maintainer: maintainer_id + """ + q = session.execute("SELECT name FROM maintainer WHERE id = :id", {'id': maintainer}).fetchall() + return fix_maintainer(q[0][0]) + +def get_maintainer_from_source(source_id, session): + """ + Returns maintainer name for given source_id. -def get_maintainer_from_source (source_id): + @type source_id: int + @param source_id: source package id + + @rtype: string + @return: maintainer name/email + """ global maintainer_from_source_cache if not maintainer_from_source_cache.has_key(source_id): - q = projectB.query("SELECT m.name FROM maintainer m, source s WHERE s.id = %s and s.maintainer = m.id" % (source_id)) - maintainer = q.getresult()[0][0] + q = session.execute("""SELECT m.name FROM maintainer m, source s + WHERE s.id = :sourceid AND s.maintainer = m.id""", + {'sourceid': source_id}) + maintainer = q.fetchall()[0][0] maintainer_from_source_cache[source_id] = fix_maintainer(maintainer) return maintainer_from_source_cache[source_id] @@ -74,31 +109,32 @@ def get_maintainer_from_source (source_id): ################################################################################ def main(): - global Cnf, projectB - - Cnf = utils.get_conf() + cnf = Config() Arguments = [('h',"help","Make-Maintainers::Options::Help")] - if not Cnf.has_key("Make-Maintainers::Options::Help"): - Cnf["Make-Maintainers::Options::Help"] = "" + if not cnf.has_key("Make-Maintainers::Options::Help"): + cnf["Make-Maintainers::Options::Help"] = "" - extra_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Make-Maintainers::Options") + extra_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) + Options = cnf.SubTree("Make-Maintainers::Options") if Options["Help"]: usage() - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - database.init(Cnf, projectB) + session = DBConn().session() - for suite in Cnf.SubTree("Suite").List(): + for suite in cnf.SubTree("Suite").List(): suite = suite.lower() - suite_priority = int(Cnf["Suite::%s::Priority" % (suite)]) + suite_priority = int(cnf["Suite::%s::Priority" % (suite)]) # Source packages - q = projectB.query("SELECT s.source, s.version, m.name FROM src_associations sa, source s, suite su, maintainer m WHERE su.suite_name = '%s' AND sa.suite = su.id AND sa.source = s.id AND m.id = s.maintainer" % (suite)) - sources = q.getresult() - for source in sources: + q = session.execute("""SELECT s.source, s.version, m.name + FROM src_associations sa, source s, suite su, maintainer m + WHERE su.suite_name = :suite_name + AND sa.suite = su.id AND sa.source = s.id + AND m.id = s.maintainer""", + {'suite_name': suite}) + for source in q.fetchall(): package = source[0] version = source[1] maintainer = fix_maintainer(source[2]) @@ -110,17 +146,20 @@ def main(): packages[package] = { "maintainer": maintainer, "priority": suite_priority, "version": version } # Binary packages - q = projectB.query("SELECT b.package, b.source, b.maintainer, b.version FROM bin_associations ba, binaries b, suite s WHERE s.suite_name = '%s' AND ba.suite = s.id AND ba.bin = b.id" % (suite)) - binaries = q.getresult() - for binary in binaries: + q = session.execute("""SELECT b.package, b.source, b.maintainer, b.version + FROM bin_associations ba, binaries b, suite s + WHERE s.suite_name = :suite_name + AND ba.suite = s.id AND ba.bin = b.id""", + {'suite_name': suite}) + for binary in q.fetchall(): package = binary[0] source_id = binary[1] version = binary[3] # Use the source maintainer first; falling back on the binary maintainer as a last resort only if source_id: - maintainer = get_maintainer_from_source(source_id) + maintainer = get_maintainer_from_source(source_id, session) else: - maintainer = get_maintainer(binary[2]) + maintainer = get_maintainer(binary[2], session) if packages.has_key(package): if packages[package]["priority"] <= suite_priority: if apt_pkg.VersionCompare(packages[package]["version"], version) < 0: @@ -130,9 +169,9 @@ def main(): # Process any additional Maintainer files (e.g. from pseudo packages) for filename in extra_files: - file = utils.open_file(filename) - for line in file.readlines(): - line = utils.re_comments.sub('', line).strip() + extrafile = utils.open_file(filename) + for line in extrafile.readlines(): + line = re_comments.sub('', line).strip() if line == "": continue split = line.split() @@ -147,7 +186,7 @@ def main(): if not packages.has_key(package) or version == '*' \ or apt_pkg.VersionCompare(packages[package]["version"], version) < 0: packages[package] = { "maintainer": maintainer, "version": version } - file.close() + extrafile.close() package_keys = packages.keys() package_keys.sort()