X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_proposed_updates.py;h=7733e7a04cb17209228241d6a585d989d0d35557;hb=ecbabfded4cf6ff0922d48ff3b61638346a1049b;hp=29fd9240b4a569d636661bf5d88f316e6f597ff0;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git diff --git a/dak/clean_proposed_updates.py b/dak/clean_proposed_updates.py index 29fd9240..7733e7a0 100755 --- a/dak/clean_proposed_updates.py +++ b/dak/clean_proposed_updates.py @@ -1,8 +1,7 @@ #!/usr/bin/env python -# Remove obsolete .changes files from proposed-updates -# Copyright (C) 2001, 2002, 2003, 2004 James Troup -# $Id: halle,v 1.13 2005-12-17 10:57:03 rmurray Exp $ +""" Remove obsolete .changes files from proposed-updates """ +# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008 James Troup # 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 @@ -20,23 +19,23 @@ ################################################################################ -import os, pg, re, sys; -import utils, db_access; -import apt_pkg; +import os, sys +import apt_pkg -################################################################################ +from daklib.dbconn import * +from daklib.config import Config +from daklib import utils +from daklib.regexes import re_isdeb, re_isadeb, re_issource, re_no_epoch -Cnf = None; -projectB = None; -Options = None; -pu = {}; +################################################################################ -re_isdeb = re.compile (r"^(.+)_(.+?)_(.+?).u?deb$"); +Options = None +pu = {} ################################################################################ def usage (exit_code=0): - print """Usage: halle [OPTION] [...] + print """Usage: dak clean-proposed-updates [OPTION] [...] Remove obsolete changes files from proposed-updates. -v, --verbose be more verbose about what is being done @@ -48,148 +47,157 @@ Need either changes files or an admin.txt file with a '.joey' suffix.""" ################################################################################ def check_changes (filename): + cnf = Config() + try: - changes = utils.parse_changes(filename); - files = utils.build_file_list(changes); + changes = utils.parse_changes(filename) + files = utils.build_file_list(changes) except: - utils.warn("Couldn't read changes file '%s'." % (filename)); - return; - num_files = len(files.keys()); - for file in files.keys(): - if utils.re_isadeb.match(file): - m = re_isdeb.match(file); - pkg = m.group(1); - version = m.group(2); - arch = m.group(3); + utils.warn("Couldn't read changes file '%s'." % (filename)) + return + num_files = len(files.keys()) + for f in files.keys(): + if re_isadeb.match(f): + m = re_isdeb.match(f) + pkg = m.group(1) + version = m.group(2) + arch = m.group(3) if Options["debug"]: - print "BINARY: %s ==> %s_%s_%s" % (file, pkg, version, arch); + print "BINARY: %s ==> %s_%s_%s" % (f, pkg, version, arch) else: - m = utils.re_issource.match(file) + m = re_issource.match(f) if m: - pkg = m.group(1); - version = m.group(2); - type = m.group(3); - if type != "dsc": - del files[file]; - num_files -= 1; - continue; - arch = "source"; + pkg = m.group(1) + version = m.group(2) + ftype = m.group(3) + if ftype != "dsc": + del files[f] + num_files -= 1 + continue + arch = "source" if Options["debug"]: - print "SOURCE: %s ==> %s_%s_%s" % (file, pkg, version, arch); + print "SOURCE: %s ==> %s_%s_%s" % (f, pkg, version, arch) else: - utils.fubar("unknown type, fix me"); + utils.fubar("unknown type, fix me") if not pu.has_key(pkg): # FIXME - utils.warn("%s doesn't seem to exist in p-u?? (from %s [%s])" % (pkg, file, filename)); - continue; + utils.warn("%s doesn't seem to exist in %s?? (from %s [%s])" % (pkg, Options["suite"], f, filename)) + continue if not pu[pkg].has_key(arch): # FIXME - utils.warn("%s doesn't seem to exist for %s in p-u?? (from %s [%s])" % (pkg, arch, file, filename)); - continue; - pu_version = utils.re_no_epoch.sub('', pu[pkg][arch]); + utils.warn("%s doesn't seem to exist for %s in %s?? (from %s [%s])" % (pkg, arch, Options["suite"], f, filename)) + continue + pu_version = re_no_epoch.sub('', pu[pkg][arch]) if pu_version == version: if Options["verbose"]: - print "%s: ok" % (file); + print "%s: ok" % (f) else: if Options["verbose"]: - print "%s: superseded, removing. [%s]" % (file, pu_version); - del files[file]; + print "%s: superseded, removing. [%s]" % (f, pu_version) + del files[f] - new_num_files = len(files.keys()); + new_num_files = len(files.keys()) if new_num_files == 0: - print "%s: no files left, superseded by %s" % (filename, pu_version); - dest = Cnf["Dir::Morgue"] + "/misc/"; - utils.move(filename, dest); + print "%s: no files left, superseded by %s" % (filename, pu_version) + dest = cnf["Dir::Morgue"] + "/misc/" + if not Options["no-action"]: + utils.move(filename, dest) elif new_num_files < num_files: - print "%s: lost files, MWAAP." % (filename); + print "%s: lost files, MWAAP." % (filename) else: if Options["verbose"]: - print "%s: ok" % (filename); + print "%s: ok" % (filename) ################################################################################ def check_joey (filename): - file = utils.open_file(filename); + cnf = Config() - cwd = os.getcwd(); - os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::Root"])); + f = utils.open_file(filename) - for line in file.readlines(): - line = line.rstrip(); + cwd = os.getcwd() + os.chdir("%s/dists/%s" % (cnf["Dir::Root"]), Options["suite"]) + + for line in f.readlines(): + line = line.rstrip() if line.find('install') != -1: - split_line = line.split(); + split_line = line.split() if len(split_line) != 2: - utils.fubar("Parse error (not exactly 2 elements): %s" % (line)); - install_type = split_line[0]; + utils.fubar("Parse error (not exactly 2 elements): %s" % (line)) + install_type = split_line[0] if install_type not in [ "install", "install-u", "sync-install" ]: - utils.fubar("Unknown install type ('%s') from: %s" % (install_type, line)); + utils.fubar("Unknown install type ('%s') from: %s" % (install_type, line)) changes_filename = split_line[1] if Options["debug"]: - print "Processing %s..." % (changes_filename); - check_changes(changes_filename); + print "Processing %s..." % (changes_filename) + check_changes(changes_filename) - os.chdir(cwd); + os.chdir(cwd) ################################################################################ def init_pu (): - global pu; + global pu - q = projectB.query(""" + q = DBConn().session().execute(""" SELECT b.package, b.version, a.arch_string FROM bin_associations ba, binaries b, suite su, architecture a WHERE b.id = ba.bin AND ba.suite = su.id - AND su.suite_name = 'proposed-updates' AND a.id = b.architecture + AND su.suite_name = :suite_name AND a.id = b.architecture UNION SELECT s.source, s.version, 'source' FROM src_associations sa, source s, suite su WHERE s.id = sa.source AND sa.suite = su.id - AND su.suite_name = 'proposed-updates' -ORDER BY package, version, arch_string; -"""); - ql = q.getresult(); - for i in ql: - pkg = i[0]; - version = i[1]; - arch = i[2]; + AND su.suite_name = :suite_name +ORDER BY package, version, arch_string +""" % {'suite_name': Options["suite"]}) + + for i in q.fetchall(): + pkg = i[0] + version = i[1] + arch = i[2] if not pu.has_key(pkg): - pu[pkg] = {}; - pu[pkg][arch] = version; + pu[pkg] = {} + pu[pkg][arch] = version def main (): - global Cnf, projectB, Options; + global Options + + cnf = Config() - Cnf = utils.get_conf() + Arguments = [('d', "debug", "Clean-Proposed-Updates::Options::Debug"), + ('v', "verbose", "Clean-Proposed-Updates::Options::Verbose"), + ('h', "help", "Clean-Proposed-Updates::Options::Help"), + ('s', "suite", "Clean-Proposed-Updates::Options::Suite", "HasArg"), + ('n', "no-action", "Clean-Proposed-Updates::Options::No-Action"),] + for i in [ "debug", "verbose", "help", "no-action" ]: + if not cnf.has_key("Clean-Proposed-Updates::Options::%s" % (i)): + cnf["Clean-Proposed-Updates::Options::%s" % (i)] = "" - Arguments = [('d', "debug", "Halle::Options::Debug"), - ('v',"verbose","Halle::Options::Verbose"), - ('h',"help","Halle::Options::Help")]; - for i in [ "debug", "verbose", "help" ]: - if not Cnf.has_key("Halle::Options::%s" % (i)): - Cnf["Halle::Options::%s" % (i)] = ""; + # suite defaults to proposed-updates + if not cnf.has_key("Clean-Proposed-Updates::Options::Suite"): + cnf["Clean-Proposed-Updates::Options::Suite"] = "proposed-updates" - arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); - Options = Cnf.SubTree("Halle::Options") + arguments = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) + Options = cnf.SubTree("Clean-Proposed-Updates::Options") if Options["Help"]: - usage(0); + usage(0) if not arguments: - utils.fubar("need at least one package name as an argument."); + utils.fubar("need at least one package name as an argument.") - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); - db_access.init(Cnf, projectB); + DBConn() - init_pu(); + init_pu() - for file in arguments: - if file.endswith(".changes"): - check_changes(file); - elif file.endswith(".joey"): - check_joey(file); + for f in arguments: + if f.endswith(".changes"): + check_changes(f) + elif f.endswith(".joey"): + check_joey(f) else: - utils.fubar("Unrecognised file type: '%s'." % (file)); + utils.fubar("Unrecognised file type: '%s'." % (f)) ####################################################################################### if __name__ == '__main__': main() -