X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_proposed_updates.py;h=7733e7a04cb17209228241d6a585d989d0d35557;hb=c551da01c32f72ad427d2f9ca3c7a5658239423c;hp=02032b1217dff28014408034ea59af42ea5dcf50;hpb=d9822f04453a1b62ca0aa66e2efeea35f654778f;p=dak.git diff --git a/dak/clean_proposed_updates.py b/dak/clean_proposed_updates.py old mode 100644 new mode 100755 index 02032b12..7733e7a0 --- a/dak/clean_proposed_updates.py +++ b/dak/clean_proposed_updates.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Remove obsolete .changes files from proposed-updates +""" 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 @@ -19,20 +19,19 @@ ################################################################################ -import os, pg, re, sys +import os, sys import apt_pkg -import daklib.database -import daklib.utils + +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$") - ################################################################################ def usage (exit_code=0): @@ -48,59 +47,61 @@ Need either changes files or an admin.txt file with a '.joey' suffix.""" ################################################################################ def check_changes (filename): + cnf = Config() + try: - changes = daklib.utils.parse_changes(filename) - files = daklib.utils.build_file_list(changes) + changes = utils.parse_changes(filename) + files = utils.build_file_list(changes) except: - daklib.utils.warn("Couldn't read changes file '%s'." % (filename)) + utils.warn("Couldn't read changes file '%s'." % (filename)) return num_files = len(files.keys()) - for file in files.keys(): - if daklib.utils.re_isadeb.match(file): - m = re_isdeb.match(file) + 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 = daklib.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] + 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: - daklib.utils.fubar("unknown type, fix me") + utils.fubar("unknown type, fix me") if not pu.has_key(pkg): # FIXME - daklib.utils.warn("%s doesn't seem to exist in %s?? (from %s [%s])" % (pkg, Options["suite"], file, filename)) + 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 - daklib.utils.warn("%s doesn't seem to exist for %s in %s?? (from %s [%s])" % (pkg, arch, Options["suite"], file, filename)) + utils.warn("%s doesn't seem to exist for %s in %s?? (from %s [%s])" % (pkg, arch, Options["suite"], f, filename)) continue - pu_version = daklib.utils.re_no_epoch.sub('', pu[pkg][arch]) + 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()) if new_num_files == 0: print "%s: no files left, superseded by %s" % (filename, pu_version) - dest = Cnf["Dir::Morgue"] + "/misc/" + dest = cnf["Dir::Morgue"] + "/misc/" if not Options["no-action"]: - daklib.utils.move(filename, dest) + utils.move(filename, dest) elif new_num_files < num_files: print "%s: lost files, MWAAP." % (filename) else: @@ -110,20 +111,22 @@ def check_changes (filename): ################################################################################ def check_joey (filename): - file = daklib.utils.open_file(filename) + cnf = Config() + + f = utils.open_file(filename) cwd = os.getcwd() - os.chdir("%s/dists/%s" % (Cnf["Dir::Root"]), Options["suite"]) + os.chdir("%s/dists/%s" % (cnf["Dir::Root"]), Options["suite"]) - for line in file.readlines(): + for line in f.readlines(): line = line.rstrip() if line.find('install') != -1: split_line = line.split() if len(split_line) != 2: - daklib.utils.fubar("Parse error (not exactly 2 elements): %s" % (line)) + 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" ]: - daklib.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) @@ -136,19 +139,19 @@ def check_joey (filename): def init_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 = '%s' 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 = '%s' + AND su.suite_name = :suite_name ORDER BY package, version, arch_string -""" % (Options["suite"], Options["suite"])) - ql = q.getresult() - for i in ql: +""" % {'suite_name': Options["suite"]}) + + for i in q.fetchall(): pkg = i[0] version = i[1] arch = i[2] @@ -157,9 +160,9 @@ ORDER BY package, version, arch_string pu[pkg][arch] = version def main (): - global Cnf, projectB, Options + global Options - Cnf = daklib.utils.get_conf() + cnf = Config() Arguments = [('d', "debug", "Clean-Proposed-Updates::Options::Debug"), ('v', "verbose", "Clean-Proposed-Updates::Options::Verbose"), @@ -167,33 +170,32 @@ def main (): ('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)] = "" + if not cnf.has_key("Clean-Proposed-Updates::Options::%s" % (i)): + cnf["Clean-Proposed-Updates::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" + 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("Clean-Proposed-Updates::Options") + arguments = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) + Options = cnf.SubTree("Clean-Proposed-Updates::Options") if Options["Help"]: usage(0) if not arguments: - daklib.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"])) - daklib.database.init(Cnf, projectB) + DBConn() 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: - daklib.utils.fubar("Unrecognised file type: '%s'." % (file)) + utils.fubar("Unrecognised file type: '%s'." % (f)) #######################################################################################