X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=heidi;h=9dff02447a58b21fbcad8879c08dcfa88c82209c;hb=89ada75793da6403e6ceb74a66a119621f19bba4;hp=2ce00e7bc6160626c14e115f56a0e4f03716897d;hpb=bb8283ad6274e461fc78a00b2a52c6594c53e13d;p=dak.git diff --git a/heidi b/heidi index 2ce00e7b..9dff0244 100755 --- a/heidi +++ b/heidi @@ -1,8 +1,8 @@ #!/usr/bin/env python # Manipulate suite tags -# Copyright (C) 2000 James Troup -# $Id: heidi,v 1.2 2000-12-05 04:27:48 troup Exp $ +# Copyright (C) 2000, 2001 James Troup +# $Id: heidi,v 1.7 2001-06-22 22:53:14 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 @@ -55,15 +55,19 @@ projectB = None; def process_file (file, suite_id, action): + lines = file.readlines(); + + projectB.query("BEGIN WORK"); + if action == "set": - projectB.query("DELETE FROM bin_associations WHERE suite = %d" % (suite_id)); - projectB.query("DELETE FROM src_associations WHERE suite = %d" % (suite_id)); + projectB.query("DELETE FROM bin_associations WHERE suite = %s" % (suite_id)); + projectB.query("DELETE FROM src_associations WHERE suite = %s" % (suite_id)); action = "add"; - for line in file.readlines(): + 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"); + utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])); continue; (package, version, architecture) = split_line; @@ -75,16 +79,16 @@ def process_file (file, suite_id, action): ql = q.getresult(); if ql == []: - sys.stderr.write("W: Couldn't find '%s~%s~%s'.\n" % (package, version, architecture)); + utils.warn("Couldn't find '%s~%s~%s'." % (package, version, architecture)); continue; if len(ql) > 1: - sys.stderr.write("E: Found more than one match for '%s~%s~%s'.\n" % (package, version, architecture)); + utils.warn("Found more than one match for '%s~%s~%s'." % (package, version, architecture)); continue; id = ql[0][0]; if architecture == "source": # Find the existing assoications ID, if any - q = projectB.query("SELECT id FROM src_associations WHERE suite = %d and source = %d" % (suite_id, id)); + q = projectB.query("SELECT id FROM src_associations WHERE suite = %s and source = %s" % (suite_id, id)); ql = q.getresult(); if ql == []: assoication_id = None; @@ -93,19 +97,19 @@ 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 %d.\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 (%d, %d)" % (suite_id, id)); + 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 %d.\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 = %d" % (assoication_id)); + q = projectB.query("DELETE FROM src_associations WHERE id = %s" % (assoication_id)); else: # Find the existing assoications ID, if any - q = projectB.query("SELECT id FROM bin_associations WHERE suite = %d and bin = %d" % (suite_id, id)); + q = projectB.query("SELECT id FROM bin_associations WHERE suite = %s and bin = %s" % (suite_id, id)); ql = q.getresult(); if ql == []: assoication_id = None; @@ -114,31 +118,33 @@ 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 %d.\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 (%d, %d)" % (suite_id, id)); + 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 %d.\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 = %d" % (assoication_id)); - + q = projectB.query("DELETE FROM bin_associations WHERE id = %s" % (assoication_id)); + + projectB.query("COMMIT WORK"); + ####################################################################################### def get_list (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 = %d AND ba.bin = b.id AND b.architecture = a.id" % (suite_id)); + 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: - print "%s %s %s" % (i[0], i[1], i[2]); + print string.join(i); # List source - q = projectB.query("SELECT s.source, s.version FROM source s, src_associations sa WHERE sa.suite = %d AND sa.source = s.id" % (suite_id)); + 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: - print "%s %s source" % (i[0], i[1]); + print string.join(i) + " source"; ####################################################################################### @@ -160,7 +166,7 @@ def main (): file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); - projectB = pg.connect('projectb', 'localhost'); + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"],int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); @@ -170,31 +176,27 @@ 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: if file_list != []: for file in file_list: - process_file(utils.open_file(file_list[0],'r'), suite_id, action); + process_file(utils.open_file(file,'r'), suite_id, action); else: process_file(sys.stdin, suite_id, action);