X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=dak%2Fclean_queues.py;h=209591ac01b913d6eef2c2369e201b9ec579d231;hp=a5b154279e6597094f040113d2dc9d87a710abe5;hb=98d086ddda3772fb58c1bfa97478e8044596b569;hpb=1fa1f22b70c6ee46aea78ee40b9797a574d7c583 diff --git a/dak/clean_queues.py b/dak/clean_queues.py index a5b15427..209591ac 100755 --- a/dak/clean_queues.py +++ b/dak/clean_queues.py @@ -34,6 +34,7 @@ ################################################################################ import os, os.path, stat, sys, time +from datetime import datetime, timedelta import apt_pkg from daklib import utils from daklib import daklog @@ -65,28 +66,46 @@ Clean out incoming directories. def init (cnf): global delete_date, del_dir + # Used for directory naming + now_date = datetime.now() + + # Used for working out times delete_date = int(time.time())-(int(Options["Days"])*84600) - date = time.strftime("%Y-%m-%d") - del_dir = os.path.join(cnf["Dir::Morgue"], cnf["Clean-Queues::MorgueSubDir"], date) + + morguedir = cnf.get("Dir::Morgue", os.path.join("Dir::Pool", 'morgue')) + morguesubdir = cnf.get("Clean-Queues::MorgueSubDir", 'queue') + + # Build directory as morguedir/morguesubdir/year/month/day + del_dir = os.path.join(morguedir, + morguesubdir, + str(now_date.year), + '%.2d' % now_date.month, + '%.2d' % now_date.day) # Ensure a directory exists to remove files to if not Options["No-Action"]: if not os.path.exists(del_dir): - os.makedirs(del_dir, 02775) + os.makedirs(del_dir, 0o2775) if not os.path.isdir(del_dir): utils.fubar("%s must be a directory." % (del_dir)) # Move to the directory to clean - incoming = Options["Incoming"] - if incoming == "": - incoming = cnf["Dir::Queue::Unchecked"] - os.chdir(incoming) + incoming = Options.get("Incoming") + if not incoming: + incoming = cnf.get('Dir::Unchecked') + if not incoming: + utils.fubar("Cannot find 'unchecked' directory") + + try: + os.chdir(incoming) + except OSError as e: + utils.fubar("Cannot chdir to %s" % incoming) # Remove a file to the morgue -def remove (f): +def remove (from_dir, f): fname = os.path.basename(f) if os.access(f, os.R_OK): - Logger.log(["move file to morgue", fname, del_dir]) + Logger.log(["move file to morgue", from_dir, fname, del_dir]) if Options["Verbose"]: print "Removing '%s' (to '%s')." % (fname, del_dir) if Options["No-Action"]: @@ -97,7 +116,7 @@ def remove (f): if os.path.exists(dest_filename): dest_filename = utils.find_next_free(dest_filename, 10) Logger.log(["change destination file name", os.path.basename(dest_filename)]) - utils.move(f, dest_filename, 0660) + utils.move(f, dest_filename, 0o660) else: Logger.log(["skipping file because of permission problem", fname]) utils.warn("skipping '%s', permission denied." % fname) @@ -106,11 +125,11 @@ def remove (f): # [Used for Incoming/REJECT] # def flush_old (): - Logger.log(["check Incoming/REJECT for old files"]) + Logger.log(["check Incoming/REJECT for old files", os.getcwd()]) for f in os.listdir('.'): if os.path.isfile(f): if os.stat(f)[stat.ST_MTIME] < delete_date: - remove(f) + remove('Incoming/REJECT', f) else: if Options["Verbose"]: print "Skipping, too new, '%s'." % (os.path.basename(f)) @@ -122,7 +141,7 @@ def flush_orphans (): all_files = {} changes_files = [] - Logger.log(["check Incoming for old orphaned files"]) + Logger.log(["check Incoming for old orphaned files", os.getcwd()]) # Build up the list of all files in the directory for i in os.listdir('.'): if os.path.isfile(i): @@ -136,17 +155,17 @@ def flush_orphans (): changes = utils.parse_changes(changes_filename) files = utils.build_file_list(changes) except: - utils.warn("error processing '%s'; skipping it. [Got %s]" % (changes_filename, sys.exc_type)) + utils.warn("error processing '%s'; skipping it. [Got %s]" % (changes_filename, sys.exc_info()[0])) continue dsc_files = {} for f in files.keys(): if f.endswith(".dsc"): try: - dsc = utils.parse_changes(f) + dsc = utils.parse_changes(f, dsc_file=1) dsc_files = utils.build_file_list(dsc, is_a_dsc=1) except: - utils.warn("error processing '%s'; skipping it. [Got %s]" % (f, sys.exc_type)) + utils.warn("error processing '%s'; skipping it. [Got %s]" % (f, sys.exc_info()[0])) continue # Ensure all the files we've seen aren't deleted @@ -163,7 +182,7 @@ def flush_orphans (): # a .dsc) and should be deleted if old enough. for f in all_files.keys(): if os.stat(f)[stat.ST_MTIME] < delete_date: - remove(f) + remove('Incoming', f) else: if Options["Verbose"]: print "Skipping, too new, '%s'." % (os.path.basename(f)) @@ -187,13 +206,13 @@ def main (): ('n',"no-action","Clean-Queues::Options::No-Action"), ('v',"verbose","Clean-Queues::Options::Verbose")] - apt_pkg.ParseCommandLine(cnf.Cnf,Arguments,sys.argv) - Options = cnf.SubTree("Clean-Queues::Options") + apt_pkg.parse_commandline(cnf.Cnf,Arguments,sys.argv) + Options = cnf.subtree("Clean-Queues::Options") if Options["Help"]: usage() - Logger = daklog.Logger(cnf, 'clean-queues', Options['No-Action']) + Logger = daklog.Logger('clean-queues', Options['No-Action']) init(cnf) @@ -201,10 +220,10 @@ def main (): print "Processing incoming..." flush_orphans() - reject = cnf["Dir::Queue::Reject"] + reject = cnf["Dir::Reject"] if os.path.exists(reject) and os.path.isdir(reject): if Options["Verbose"]: - print "Processing incoming/REJECT..." + print "Processing reject directory..." os.chdir(reject) flush_old()