X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_proposed_updates.py;h=a911f899bd607d61d60904e3056dc9fa4c91fa4e;hb=b1d8f74d334ce0ad78005582ca96285bc6cd0b91;hp=9faf7eb159934ef8fcb2fcaabd0dcb9d34149795;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git diff --git a/dak/clean_proposed_updates.py b/dak/clean_proposed_updates.py index 9faf7eb1..a911f899 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 $ +# Copyright (C) 2001, 2002, 2003, 2004, 2006 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 @@ -21,8 +20,9 @@ ################################################################################ import os, pg, re, sys -import utils, db_access import apt_pkg +import daklib.database +import daklib.utils ################################################################################ @@ -36,7 +36,7 @@ re_isdeb = re.compile (r"^(.+)_(.+?)_(.+?).u?deb$") ################################################################################ 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 @@ -49,14 +49,14 @@ Need either changes files or an admin.txt file with a '.joey' suffix.""" def check_changes (filename): try: - changes = utils.parse_changes(filename) - files = utils.build_file_list(changes) + changes = daklib.utils.parse_changes(filename) + files = daklib.utils.build_file_list(changes) except: - utils.warn("Couldn't read changes file '%s'." % (filename)) + daklib.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): + if daklib.utils.re_isadeb.match(file): m = re_isdeb.match(file) pkg = m.group(1) version = m.group(2) @@ -64,7 +64,7 @@ def check_changes (filename): if Options["debug"]: print "BINARY: %s ==> %s_%s_%s" % (file, pkg, version, arch) else: - m = utils.re_issource.match(file) + m = daklib.utils.re_issource.match(file) if m: pkg = m.group(1) version = m.group(2) @@ -77,16 +77,16 @@ def check_changes (filename): if Options["debug"]: print "SOURCE: %s ==> %s_%s_%s" % (file, pkg, version, arch) else: - utils.fubar("unknown type, fix me") + daklib.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)) + daklib.utils.warn("%s doesn't seem to exist in p-u?? (from %s [%s])" % (pkg, file, 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)) + daklib.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]) + pu_version = daklib.utils.re_no_epoch.sub('', pu[pkg][arch]) if pu_version == version: if Options["verbose"]: print "%s: ok" % (file) @@ -99,7 +99,7 @@ def check_changes (filename): 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) + daklib.utils.move(filename, dest) elif new_num_files < num_files: print "%s: lost files, MWAAP." % (filename) else: @@ -109,7 +109,7 @@ def check_changes (filename): ################################################################################ def check_joey (filename): - file = utils.open_file(filename) + file = daklib.utils.open_file(filename) cwd = os.getcwd() os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::Root"])) @@ -119,10 +119,10 @@ def check_joey (filename): if line.find('install') != -1: split_line = line.split() if len(split_line) != 2: - utils.fubar("Parse error (not exactly 2 elements): %s" % (line)) + daklib.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)) + daklib.utils.fubar("Unknown install type ('%s') from: %s" % (install_type, line)) changes_filename = split_line[1] if Options["debug"]: print "Processing %s..." % (changes_filename) @@ -158,25 +158,25 @@ ORDER BY package, version, arch_string def main (): global Cnf, projectB, Options - Cnf = utils.get_conf() + Cnf = daklib.utils.get_conf() - Arguments = [('d', "debug", "Halle::Options::Debug"), - ('v',"verbose","Halle::Options::Verbose"), - ('h',"help","Halle::Options::Help")] + Arguments = [('d', "debug", "Clean-Proposed-Updates::Options::Debug"), + ('v',"verbose","Clean-Proposed-Updates::Options::Verbose"), + ('h',"help","Clean-Proposed-Updates::Options::Help")] for i in [ "debug", "verbose", "help" ]: - if not Cnf.has_key("Halle::Options::%s" % (i)): - Cnf["Halle::Options::%s" % (i)] = "" + if not Cnf.has_key("Clean-Proposed-Updates::Options::%s" % (i)): + Cnf["Clean-Proposed-Updates::Options::%s" % (i)] = "" arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Halle::Options") + Options = Cnf.SubTree("Clean-Proposed-Updates::Options") if Options["Help"]: usage(0) if not arguments: - utils.fubar("need at least one package name as an argument.") + daklib.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) + daklib.database.init(Cnf, projectB) init_pu() @@ -186,7 +186,7 @@ def main (): elif file.endswith(".joey"): check_joey(file) else: - utils.fubar("Unrecognised file type: '%s'." % (file)) + daklib.utils.fubar("Unrecognised file type: '%s'." % (file)) #######################################################################################