X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=heidi;h=5af7c3fddc97486a50f1c850fcba42f25cd161e1;hb=b618ca40333f46edada83f0329f85cec83bca7eb;hp=959061032608a4b77c1fb6721c1e795c1d5c7873;hpb=d322dd53c86f83825247565fbe62df975832a856;p=dak.git diff --git a/heidi b/heidi index 95906103..5af7c3fd 100755 --- a/heidi +++ b/heidi @@ -2,7 +2,7 @@ # Manipulate suite tags # Copyright (C) 2000, 2001 James Troup -# $Id: heidi,v 1.6 2001-06-20 18:47:37 troup Exp $ +# $Id: heidi,v 1.8 2001-09-14 17:16:18 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,55 +38,119 @@ # Adds or removes packages from a suite. Takes the list of files # either from stdin or as a command line argument. Special action -# "set", will reset the suite (!) and add all packages from scratch. +# "set", will reset the suite (!) and add all packages from scratch. ####################################################################################### import os, pg, string, sys; import apt_pkg; -import utils, db_access; +import utils, db_access, logging; ####################################################################################### Cnf = None; projectB = None; +Logger = None; ####################################################################################### -def process_file (file, suite_id, action): +def get_id (package, version, architecture): + if architecture == "source": + q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, 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 ql == []: + utils.warn("Couldn't find '%s~%s~%s'." % (package, version, architecture)); + return None; + if len(ql) > 1: + utils.warn("Found more than one match for '%s~%s~%s'." % (package, version, architecture)); + return None; + id = ql[0][0]; + return id; + +####################################################################################### + +def set_suite (file, suite_id): lines = file.readlines(); projectB.query("BEGIN WORK"); - if action == "set": - projectB.query("DELETE FROM bin_associations WHERE suite = %s" % (suite_id)); - projectB.query("DELETE FROM src_associations WHERE suite = %s" % (suite_id)); - action = "add"; - + # 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: + key = string.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: + key = string.join(i[:2]) + " source"; + current[key] = i[2]; + + # Build up a dictionary of what should be in the suite + desired = {}; for line in lines: split_line = string.split(string.strip(line[:-1])); if len(split_line) != 3: - sys.stderr.write("W: '%s' does not break into 'package version architecture'.\n" % (line[:-1])); + utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])); continue; - - (package, version, architecture) = split_line; + key = string.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) = string.split(key); + 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(): + if not current.has_key(key): + (package, version, architecture) = string.split(key); + id = get_id (package, version, architecture); + if not id: + continue; + if architecture == "source": + q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, id)); + else: + q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, id)); + Logger.log(["added",key,id]); - if architecture == "source": - q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, 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)) + projectB.query("COMMIT WORK"); - ql = q.getresult(); - if ql == []: - sys.stderr.write("W: Couldn't find '%s~%s~%s'.\n" % (package, version, architecture)); +####################################################################################### + +def process_file (file, suite_id, action): + + if action == "set": + set_suite (file, suite_id); + return; + + lines = file.readlines(); + + projectB.query("BEGIN WORK"); + + for line in lines: + split_line = string.split(string.strip(line[:-1])); + if len(split_line) != 3: + utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])); continue; - if len(ql) > 1: - sys.stderr.write("E: Found more than one match for '%s~%s~%s'.\n" % (package, version, architecture)); + + (package, version, architecture) = split_line; + + id = get_id(package, version, architecture); + if not id: continue; - id = ql[0][0]; - if architecture == "source": + 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(); @@ -97,13 +161,13 @@ def process_file (file, suite_id, action): # Take action if action == "add": if assoication_id != None: - sys.stderr.write("W: '%s~%s~%s' already exists in suite %s.\n" % (package, version, architecture, suite_id)); + utils.warn("'%s~%s~%s' already exists in suite %s." % (package, version, architecture, suite_id)); continue; else: q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, id)); elif action == "remove": if assoication_id == None: - sys.stderr.write("W: '%s~%s~%s' doesn't exist in suite %s.\n" % (package, version, architecture, suite_id)); + utils.warn("'%s~%s~%s' doesn't exist in suite %s." % (package, version, architecture, suite_id)); continue; else: q = projectB.query("DELETE FROM src_associations WHERE id = %s" % (assoication_id)); @@ -118,13 +182,13 @@ def process_file (file, suite_id, action): # Take action if action == "add": if assoication_id != None: - sys.stderr.write("W: '%s~%s~%s' already exists in suite %s.\n" % (package, version, architecture, suite_id)); + utils.warn("'%s~%s~%s' already exists in suite %s." % (package, version, architecture, suite_id)); continue; else: q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, id)); elif action == "remove": if assoication_id == None: - sys.stderr.write("W: '%s~%s~%s' doesn't exist in suite %s.\n" % (package, version, architecture, suite_id)); + utils.warn("'%s~%s~%s' doesn't exist in suite %s." % (package, version, architecture, suite_id)); continue; else: q = projectB.query("DELETE FROM bin_associations WHERE id = %s" % (assoication_id)); @@ -149,20 +213,20 @@ def get_list (suite_id): ####################################################################################### def main (): - global Cnf, projectB; + global Cnf, projectB, Logger; apt_pkg.init(); - + Cnf = apt_pkg.newConfiguration(); apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); Arguments = [('a',"add","Heidi::Options::Add", "HasArg"), - ('d',"debug","Heidi::Options::Debug", "IntVal"), + ('D',"debug","Heidi::Options::Debug", "IntVal"), ('h',"help","Heidi::Options::Help"), ('l',"list","Heidi::Options::List","HasArg"), ('r',"remove", "Heidi::Options::Remove", "HasArg"), ('s',"set", "Heidi::Options::Set", "HasArg"), - ('v',"version","Heidi::Options::Version")]; + ('V',"version","Heidi::Options::Version")]; file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); @@ -176,33 +240,31 @@ def main (): suite = Cnf["Heidi::Options::%s" % (i)]; if suite !="": if not Cnf.has_key("Suite::%s" % (suite)): - sys.stderr.write("Unknown suite %s.\n" %(suite)); - sys.exit(2); + utils.fubar("Unknown suite '%s'." %(suite)); else: suite_id = db_access.get_suite_id(suite); if action != None: - sys.stderr.write("Can only do one action at a time.\n"); - sys.exit(2); + utils.fubar("Can only perform one action at a time."); action = i; # Need an action... if action == None: - sys.stderr.write("No action specified.\n"); - sys.exit(2); + utils.fubar("No action specified."); # Safety/Sanity check if action == "set" and suite != "testing": - sys.stderr.write("Will not reset a suite other than testing...\n"); - sys.exit(2); + utils.fubar("Will not reset a suite other than testing."); if action == "list": get_list(suite_id); else: + Logger = logging.Logger(Cnf, "heidi"); if file_list != []: for file in file_list: process_file(utils.open_file(file,'r'), suite_id, action); else: process_file(sys.stdin, suite_id, action); + Logger.close(); #######################################################################################