X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=57e43da6ac0b77418c8b4745d4c900ef9c4c8728;hb=27e00376e81d1c37ff327ee0d39670b266418869;hp=3a94ca5de4279ed6e581d37b6b24ef9aad78373f;hpb=1bcac7a38c0b55aa9a8ec984c44661f92e7bc536;p=dak.git diff --git a/dak/control_suite.py b/dak/control_suite.py index 3a94ca5d..57e43da6 100755 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Manipulate suite tags +""" Manipulate suite tags """ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 James Troup # This program is free software; you can redistribute it and/or modify @@ -41,16 +41,18 @@ ####################################################################################### -import pg, sys +import sys import apt_pkg -import daklib.database -import daklib.logging -import daklib.utils +import os + +from daklib.config import Config +from daklib.dbconn import * +from daklib import daklog +from daklib import utils +from daklib.queue import get_suite_version_by_package, get_suite_version_by_source ####################################################################################### -Cnf = None -projectB = None Logger = None ################################################################################ @@ -63,45 +65,166 @@ Display or alter the contents of a suite using FILE(s), or stdin. -h, --help show this help and exit -l, --list=SUITE list the contents of SUITE -r, --remove=SUITE remove from SUITE - -s, --set=SUITE set SUITE""" + -s, --set=SUITE set SUITE + -b, --britney generate changelog entry for britney runs""" sys.exit(exit_code) ####################################################################################### -def get_id (package, version, architecture): +def get_id(package, version, architecture, session): if architecture == "source": - q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, version)) + q = session.execute("SELECT id FROM source WHERE source = :package AND version = :version", + {'package': package, 'version': version}) else: - q = projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND (a.arch_string = '%s' OR a.arch_string = 'all') AND b.architecture = a.id" % (package, version, architecture)) - - ql = q.getresult() - if not ql: - daklib.utils.warn("Couldn't find '%s_%s_%s'." % (package, version, architecture)) + q = session.execute("""SELECT b.id FROM binaries b, architecture a + WHERE b.package = :package AND b.version = :version + AND (a.arch_string = :arch OR a.arch_string = 'all') + AND b.architecture = a.id""", + {'package': package, 'version': version, 'arch': architecture}) + + ql = q.fetchall() + if len(ql) < 1: + utils.warn("Couldn't find '%s_%s_%s'." % (package, version, architecture)) return None + if len(ql) > 1: - daklib.utils.warn("Found more than one match for '%s_%s_%s'." % (package, version, architecture)) + utils.warn("Found more than one match for '%s_%s_%s'." % (package, version, architecture)) return None - id = ql[0][0] - return id + + return ql[0][0] ####################################################################################### -def set_suite (file, suite_id): +def britney_changelog(packages, suite, session): + + old = {} + current = {} + Cnf = utils.get_conf() + + try: + q = session.execute("SELECT changelog FROM suite WHERE id = :suiteid", \ + {'suiteid': suite.suite_id}) + brit_file = q.fetchone()[0] + except: + brit_file = None + + if brit_file: + brit_file = os.path.join(Cnf['Dir::Root'], brit_file) + else: + return + + q = session.execute("""SELECT s.source, s.version, sa.id + FROM source s, src_associations sa + WHERE sa.suite = :suiteid + AND sa.source = s.id""", {'suiteid': suite.suite_id}) + + for p in q.fetchall(): + current[p[0]] = p[1] + for p in packages.keys(): + p = p.split() + if p[2] == "source": + old[p[0]] = p[1] + + new = {} + for p in current.keys(): + if p in old.keys(): + if apt_pkg.VersionCompare(current[p], old[p]) > 0: + new[p] = [current[p], old[p]] + else: + new[p] = [current[p], 0] + + query = "SELECT source, changelog FROM changelogs WHERE" + for p in new.keys(): + query += " source = '%s' AND version > '%s' AND version <= '%s'" \ + % (p, new[p][1], new[p][0]) + query += " AND architecture LIKE '%source%' AND distribution in \ + ('unstable', 'experimental', 'testing-proposed-updates') OR" + query += " False ORDER BY source, version DESC" + q = session.execute(query) + + pu = None + brit = utils.open_file(brit_file, 'w') + + for u in q: + if pu and pu != u[0]: + brit.write("\n") + brit.write("%s\n" % u[1]) + pu = u[0] + if q.rowcount: brit.write("\n\n\n") + + for p in list(set(old.keys()).difference(current.keys())): + brit.write("REMOVED: %s %s\n" % (p, old[p])) + + brit.flush() + brit.close() + +####################################################################################### + +def version_checks(package, architecture, target_suite, new_version, session, force = False): + if architecture == "source": + suite_version_list = get_suite_version_by_source(package, session) + else: + suite_version_list = get_suite_version_by_package(package, architecture, session) + + must_be_newer_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeNewerThan") ] + must_be_older_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeOlderThan") ] + + # Must be newer than an existing version in target_suite + if target_suite not in must_be_newer_than: + must_be_newer_than.append(target_suite) + + violations = False + + for suite, version in suite_version_list: + cmp = apt_pkg.VersionCompare(new_version, version) + if suite in must_be_newer_than and cmp < 1: + utils.warn("%s (%s): version check violated: %s targeted at %s is *not* newer than %s in %s" % (package, architecture, new_version, target_suite, version, suite)) + violations = True + if suite in must_be_older_than and cmp > 1: + utils.warn("%s (%s): version check violated: %s targeted at %s is *not* older than %s in %s" % (package, architecture, new_version, target_suite, version, suite)) + violations = True + + if violations: + if force: + utils.warn("Continuing anyway (forced)...") + else: + utils.fubar("Aborting. Version checks violated and not forced.") + +####################################################################################### + +def cmp_package_version(a, b): + """ + comparison function for tuples of the form (package-name, version ...) + """ + cmp_package = cmp(a[0], b[0]) + if cmp_package != 0: + return cmp_package + return apt_pkg.VersionCompare(a[1], b[1]) + +####################################################################################### + +def set_suite(file, suite, session, britney=False, force=False): + suite_id = suite.suite_id lines = file.readlines() - projectB.query("BEGIN WORK") + # Our session is already in a transaction # Build up a dictionary of what is currently in the suite current = {} - q = projectB.query("SELECT b.package, b.version, a.arch_string, ba.id FROM binaries b, bin_associations ba, architecture a WHERE ba.suite = %s AND ba.bin = b.id AND b.architecture = a.id" % (suite_id)) - ql = q.getresult() - for i in ql: + q = session.execute("""SELECT b.package, b.version, a.arch_string, ba.id + FROM binaries b, bin_associations ba, architecture a + WHERE ba.suite = :suiteid + AND ba.bin = b.id AND b.architecture = a.id""", {'suiteid': suite_id}) + for i in q.fetchall(): key = " ".join(i[:3]) current[key] = i[3] - q = projectB.query("SELECT s.source, s.version, sa.id FROM source s, src_associations sa WHERE sa.suite = %s AND sa.source = s.id" % (suite_id)) - ql = q.getresult() - for i in ql: + + q = session.execute("""SELECT s.source, s.version, sa.id + FROM source s, src_associations sa + WHERE sa.suite = :suiteid + AND sa.source = s.id""", {'suiteid': suite_id}) + for i in q.fetchall(): key = " ".join(i[:2]) + " source" current[key] = i[2] @@ -110,184 +233,219 @@ def set_suite (file, suite_id): for line in lines: split_line = line.strip().split() if len(split_line) != 3: - daklib.utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) + utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) continue key = " ".join(split_line) desired[key] = "" - # Check to see which packages need removed and remove them - for key in current.keys(): - if not desired.has_key(key): - (package, version, architecture) = key.split() - id = current[key] - if architecture == "source": - q = projectB.query("DELETE FROM src_associations WHERE id = %s" % (id)) - else: - q = projectB.query("DELETE FROM bin_associations WHERE id = %s" % (id)) - Logger.log(["removed",key,id]) - # Check to see which packages need added and add them - for key in desired.keys(): + for key in sorted(desired.keys(), cmp=cmp_package_version): if not current.has_key(key): (package, version, architecture) = key.split() - id = get_id (package, version, architecture) - if not id: + version_checks(package, architecture, suite.suite_name, version, session, force) + pkid = get_id (package, version, architecture, session) + if not pkid: continue if architecture == "source": - q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, id)) + session.execute("""INSERT INTO src_associations (suite, source) + VALUES (:suiteid, :pkid)""", {'suiteid': suite_id, 'pkid': pkid}) else: - q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, id)) - Logger.log(["added",key,id]) + session.execute("""INSERT INTO bin_associations (suite, bin) + VALUES (:suiteid, :pkid)""", {'suiteid': suite_id, 'pkid': pkid}) + Logger.log(["added", key, pkid]) - projectB.query("COMMIT WORK") + # Check to see which packages need removed and remove them + for key in current.keys(): + if not desired.has_key(key): + (package, version, architecture) = key.split() + pkid = current[key] + if architecture == "source": + session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': pkid}) + else: + session.execute("""DELETE FROM bin_associations WHERE id = :pkid""", {'pkid': pkid}) + Logger.log(["removed", key, pkid]) -####################################################################################### + session.commit() -def process_file (file, suite, action): + if britney: + britney_changelog(current, suite, session) - suite_id = daklib.database.get_suite_id(suite) +####################################################################################### +def process_file(file, suite, action, session, britney=False, force=False): if action == "set": - set_suite (file, suite_id) + set_suite(file, suite, session, britney, force) return - lines = file.readlines() + suite_id = suite.suite_id - projectB.query("BEGIN WORK") + request = [] - for line in lines: + # Our session is already in a transaction + for line in file: split_line = line.strip().split() if len(split_line) != 3: - daklib.utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) + utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) continue + request.append(split_line) - (package, version, architecture) = split_line + request.sort(cmp=cmp_package_version) - id = get_id(package, version, architecture) - if not id: + for package, version, architecture in request: + pkid = get_id(package, version, architecture, session) + if not pkid: continue + # Do version checks when adding packages + if action == "add": + version_checks(package, architecture, suite.suite_name, version, session, force) + if architecture == "source": - # Find the existing assoications ID, if any - q = projectB.query("SELECT id FROM src_associations WHERE suite = %s and source = %s" % (suite_id, id)) - ql = q.getresult() - if not ql: - assoication_id = None + # Find the existing association ID, if any + q = session.execute("""SELECT id FROM src_associations + WHERE suite = :suiteid and source = :pkid""", + {'suiteid': suite_id, 'pkid': pkid}) + ql = q.fetchall() + if len(ql) < 1: + association_id = None else: - assoication_id = ql[0][0] + association_id = ql[0][0] + # Take action if action == "add": - if assoication_id: - daklib.utils.warn("'%s_%s_%s' already exists in suite %s." % (package, version, architecture, suite)) + if association_id: + utils.warn("'%s_%s_%s' already exists in suite %s." % (package, version, architecture, suite)) continue else: - q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, id)) + session.execute("""INSERT INTO src_associations (suite, source) + VALUES (:suiteid, :pkid)""", + {'suiteid': suite_id, 'pkid': pkid}) elif action == "remove": - if assoication_id == None: - daklib.utils.warn("'%s_%s_%s' doesn't exist in suite %s." % (package, version, architecture, suite)) + if association_id == None: + utils.warn("'%s_%s_%s' doesn't exist in suite %s." % (package, version, architecture, suite)) continue else: - q = projectB.query("DELETE FROM src_associations WHERE id = %s" % (assoication_id)) + session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': association_id}) else: - # Find the existing assoications ID, if any - q = projectB.query("SELECT id FROM bin_associations WHERE suite = %s and bin = %s" % (suite_id, id)) - ql = q.getresult() - if not ql: - assoication_id = None + # Find the existing associations ID, if any + q = session.execute("""SELECT id FROM bin_associations + WHERE suite = :suiteid and bin = :pkid""", + {'suiteid': suite_id, 'pkid': pkid}) + ql = q.fetchall() + if len(ql) < 1: + association_id = None else: - assoication_id = ql[0][0] + association_id = ql[0][0] + # Take action if action == "add": - if assoication_id: - daklib.utils.warn("'%s_%s_%s' already exists in suite %s." % (package, version, architecture, suite)) + if association_id: + utils.warn("'%s_%s_%s' already exists in suite %s." % (package, version, architecture, suite)) continue else: - q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, id)) + session.execute("""INSERT INTO bin_associations (suite, bin) + VALUES (:suiteid, :pkid)""", + {'suiteid': suite_id, 'pkid': pkid}) elif action == "remove": - if assoication_id == None: - daklib.utils.warn("'%s_%s_%s' doesn't exist in suite %s." % (package, version, architecture, suite)) + if association_id == None: + utils.warn("'%s_%s_%s' doesn't exist in suite %s." % (package, version, architecture, suite)) continue else: - q = projectB.query("DELETE FROM bin_associations WHERE id = %s" % (assoication_id)) + session.execute("""DELETE FROM bin_associations WHERE id = :pkid""", {'pkid': association_id}) - projectB.query("COMMIT WORK") + session.commit() ####################################################################################### -def get_list (suite): - suite_id = daklib.database.get_suite_id(suite) +def get_list(suite, session): + suite_id = suite.suite_id # List binaries - q = projectB.query("SELECT b.package, b.version, a.arch_string FROM binaries b, bin_associations ba, architecture a WHERE ba.suite = %s AND ba.bin = b.id AND b.architecture = a.id" % (suite_id)) - ql = q.getresult() - for i in ql: + q = session.execute("""SELECT b.package, b.version, a.arch_string + FROM binaries b, bin_associations ba, architecture a + WHERE ba.suite = :suiteid + AND ba.bin = b.id AND b.architecture = a.id""", {'suiteid': suite_id}) + for i in q.fetchall(): print " ".join(i) # List source - q = projectB.query("SELECT s.source, s.version FROM source s, src_associations sa WHERE sa.suite = %s AND sa.source = s.id" % (suite_id)) - ql = q.getresult() - for i in ql: + q = session.execute("""SELECT s.source, s.version + FROM source s, src_associations sa + WHERE sa.suite = :suiteid + AND sa.source = s.id""", {'suiteid': suite_id}) + for i in q.fetchall(): print " ".join(i) + " source" ####################################################################################### def main (): - global Cnf, projectB, Logger + global Logger - Cnf = daklib.utils.get_conf() + cnf = Config() Arguments = [('a',"add","Control-Suite::Options::Add", "HasArg"), + ('b',"britney","Control-Suite::Options::Britney"), + ('f','force','Control-Suite::Options::Force'), ('h',"help","Control-Suite::Options::Help"), ('l',"list","Control-Suite::Options::List","HasArg"), ('r',"remove", "Control-Suite::Options::Remove", "HasArg"), ('s',"set", "Control-Suite::Options::Set", "HasArg")] - for i in ["add", "help", "list", "remove", "set", "version" ]: - if not Cnf.has_key("Control-Suite::Options::%s" % (i)): - Cnf["Control-Suite::Options::%s" % (i)] = "" + for i in ["add", "britney", "help", "list", "remove", "set", "version" ]: + if not cnf.has_key("Control-Suite::Options::%s" % (i)): + cnf["Control-Suite::Options::%s" % (i)] = "" - file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Control-Suite::Options") + try: + file_list = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv); + except SystemError as e: + print "%s\n" % e + usage(1) + Options = cnf.SubTree("Control-Suite::Options") if Options["Help"]: - usage() + usage() - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"],int(Cnf["DB::Port"])) + session = DBConn().session() - daklib.database.init(Cnf, projectB) + force = Options.has_key("Force") and Options["Force"] action = None for i in ("add", "list", "remove", "set"): - if Cnf["Control-Suite::Options::%s" % (i)] != "": - suite = Cnf["Control-Suite::Options::%s" % (i)] - if daklib.database.get_suite_id(suite) == -1: - daklib.utils.fubar("Unknown suite '%s'." %(suite)) + if cnf["Control-Suite::Options::%s" % (i)] != "": + suite_name = cnf["Control-Suite::Options::%s" % (i)] + suite = get_suite(suite_name, session=session) + if suite is None: + utils.fubar("Unknown suite '%s'." % (suite_name)) else: if action: - daklib.utils.fubar("Can only perform one action at a time.") + utils.fubar("Can only perform one action at a time.") action = i # Need an action... if action == None: - daklib.utils.fubar("No action specified.") + utils.fubar("No action specified.") # Safety/Sanity check - if action == "set" and suite != "testing": - daklib.utils.fubar("Will not reset a suite other than testing.") + # XXX: This should be stored in the database + if action == "set" and suite_name not in ["testing", "squeeze-updates"]: + utils.fubar("Will not reset suite %s" % (suite_name)) + + britney = False + if action == "set" and cnf["Control-Suite::Options::Britney"]: + britney = True if action == "list": - get_list(suite) + get_list(suite, session) else: - Logger = daklib.logging.Logger(Cnf, "control-suite") + Logger = daklog.Logger("control-suite") if file_list: - for file in file_list: - process_file(daklib.utils.open_file(file), suite, action) + for f in file_list: + process_file(utils.open_file(f), suite, action, session, britney, force) else: - process_file(sys.stdin, suite, action) + process_file(sys.stdin, suite, action, session, britney, force) Logger.close() ####################################################################################### if __name__ == '__main__': main() -