X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_queues.py;h=9f771b7261e6fbd8c846c9966327fe43d4ebfff4;hb=f8996e240d9d0278bce098e23be63db0bcc6fbee;hp=32d8cd7e29e8b171fb0c9387242964b5261370d0;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git diff --git a/dak/clean_queues.py b/dak/clean_queues.py index 32d8cd7e..9f771b72 100755 --- a/dak/clean_queues.py +++ b/dak/clean_queues.py @@ -1,8 +1,7 @@ #!/usr/bin/env python # Clean incoming of old unused files -# Copyright (C) 2000, 2001, 2002 James Troup -# $Id: shania,v 1.18 2005-03-06 21:51:51 rmurray Exp $ +# Copyright (C) 2000, 2001, 2002, 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 @@ -35,8 +34,8 @@ ################################################################################ import os, stat, sys, time -import utils import apt_pkg +from daklib import utils ################################################################################ @@ -48,7 +47,7 @@ delete_date = None ################################################################################ def usage (exit_code=0): - print """Usage: shania [OPTIONS] + print """Usage: dak clean-queues [OPTIONS] Clean out incoming directories. -d, --days=DAYS remove anything older than DAYS old @@ -69,7 +68,7 @@ def init (): # Ensure a directory exists to remove files to if not Options["No-Action"]: date = time.strftime("%Y-%m-%d") - del_dir = Cnf["Dir::Morgue"] + '/' + Cnf["Shania::MorgueSubDir"] + '/' + date + del_dir = Cnf["Dir::Morgue"] + '/' + Cnf["Clean-Queues::MorgueSubDir"] + '/' + date if not os.path.exists(del_dir): os.makedirs(del_dir, 02775) if not os.path.isdir(del_dir): @@ -82,32 +81,32 @@ def init (): os.chdir(incoming) # Remove a file to the morgue -def remove (file): - if os.access(file, os.R_OK): - dest_filename = del_dir + '/' + os.path.basename(file) +def remove (f): + if os.access(f, os.R_OK): + dest_filename = del_dir + '/' + os.path.basename(f) # If the destination file exists; try to find another filename to use if os.path.exists(dest_filename): dest_filename = utils.find_next_free(dest_filename, 10) - utils.move(file, dest_filename, 0660) + utils.move(f, dest_filename, 0660) else: - utils.warn("skipping '%s', permission denied." % (os.path.basename(file))) + utils.warn("skipping '%s', permission denied." % (os.path.basename(f))) # Removes any old files. # [Used for Incoming/REJECT] # def flush_old (): - for file in os.listdir('.'): - if os.path.isfile(file): - if os.stat(file)[stat.ST_MTIME] < delete_date: + for f in os.listdir('.'): + if os.path.isfile(f): + if os.stat(f)[stat.ST_MTIME] < delete_date: if Options["No-Action"]: - print "I: Would delete '%s'." % (os.path.basename(file)) + print "I: Would delete '%s'." % (os.path.basename(f)) else: if Options["Verbose"]: - print "Removing '%s' (to '%s')." % (os.path.basename(file), del_dir) - remove(file) + print "Removing '%s' (to '%s')." % (os.path.basename(f), del_dir) + remove(f) else: if Options["Verbose"]: - print "Skipping, too new, '%s'." % (os.path.basename(file)) + print "Skipping, too new, '%s'." % (os.path.basename(f)) # Removes any files which are old orphans (not associated with a valid .changes file). # [Used for Incoming] @@ -133,13 +132,13 @@ def flush_orphans (): continue dsc_files = {} - for file in files.keys(): - if file.endswith(".dsc"): + for f in files.keys(): + if f.endswith(".dsc"): try: - dsc = utils.parse_changes(file) + dsc = utils.parse_changes(f) dsc_files = utils.build_file_list(dsc, is_a_dsc=1) except: - utils.warn("error processing '%s'; skipping it. [Got %s]" % (file, sys.exc_type)) + utils.warn("error processing '%s'; skipping it. [Got %s]" % (f, sys.exc_type)) continue # Ensure all the files we've seen aren't deleted @@ -154,17 +153,17 @@ def flush_orphans (): # Anthing left at this stage is not referenced by a .changes (or # a .dsc) and should be deleted if old enough. - for file in all_files.keys(): - if os.stat(file)[stat.ST_MTIME] < delete_date: + for f in all_files.keys(): + if os.stat(f)[stat.ST_MTIME] < delete_date: if Options["No-Action"]: - print "I: Would delete '%s'." % (os.path.basename(file)) + print "I: Would delete '%s'." % (os.path.basename(f)) else: if Options["Verbose"]: - print "Removing '%s' (to '%s')." % (os.path.basename(file), del_dir) - remove(file) + print "Removing '%s' (to '%s')." % (os.path.basename(f), del_dir) + remove(f) else: if Options["Verbose"]: - print "Skipping, too new, '%s'." % (os.path.basename(file)) + print "Skipping, too new, '%s'." % (os.path.basename(f)) ################################################################################ @@ -174,22 +173,22 @@ def main (): Cnf = utils.get_conf() for i in ["Help", "Incoming", "No-Action", "Verbose" ]: - if not Cnf.has_key("Shania::Options::%s" % (i)): - Cnf["Shania::Options::%s" % (i)] = "" - if not Cnf.has_key("Shania::Options::Days"): - Cnf["Shania::Options::Days"] = "14" + if not Cnf.has_key("Clean-Queues::Options::%s" % (i)): + Cnf["Clean-Queues::Options::%s" % (i)] = "" + if not Cnf.has_key("Clean-Queues::Options::Days"): + Cnf["Clean-Queues::Options::Days"] = "14" - Arguments = [('h',"help","Shania::Options::Help"), - ('d',"days","Shania::Options::Days", "IntLevel"), - ('i',"incoming","Shania::Options::Incoming", "HasArg"), - ('n',"no-action","Shania::Options::No-Action"), - ('v',"verbose","Shania::Options::Verbose")] + Arguments = [('h',"help","Clean-Queues::Options::Help"), + ('d',"days","Clean-Queues::Options::Days", "IntLevel"), + ('i',"incoming","Clean-Queues::Options::Incoming", "HasArg"), + ('n',"no-action","Clean-Queues::Options::No-Action"), + ('v',"verbose","Clean-Queues::Options::Verbose")] apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Shania::Options") + Options = Cnf.SubTree("Clean-Queues::Options") if Options["Help"]: - usage() + usage() init()