From: Joerg Jaspert Date: Tue, 27 Oct 2009 20:48:13 +0000 (+0100) Subject: Merge commit 'djpig/djpig' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4c2ec0229b86a4ddb196bb567cf90ea2f94ae84f;hp=3a044cf559c390a0a4dc0658ec565b6a327f136a;p=dak.git Merge commit 'djpig/djpig' into merge * commit 'djpig/djpig': clean-queues: Add proper logging use the id, not the object add regex import file -> f we're already in the changes object use isinstance fixup Signed-off-by: Joerg Jaspert --- diff --git a/dak/clean_queues.py b/dak/clean_queues.py index 34d90473..a5b15427 100755 --- a/dak/clean_queues.py +++ b/dak/clean_queues.py @@ -33,14 +33,16 @@ ################################################################################ -import os, stat, sys, time +import os, os.path, stat, sys, time import apt_pkg from daklib import utils +from daklib import daklog +from daklib.config import Config ################################################################################ -Cnf = None Options = None +Logger = None del_dir = None delete_date = None @@ -60,15 +62,15 @@ Clean out incoming directories. ################################################################################ -def init (): +def init (cnf): global delete_date, del_dir 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) # 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["Clean-Queues::MorgueSubDir"] + '/' + date if not os.path.exists(del_dir): os.makedirs(del_dir, 02775) if not os.path.isdir(del_dir): @@ -77,33 +79,38 @@ def init (): # Move to the directory to clean incoming = Options["Incoming"] if incoming == "": - incoming = Cnf["Dir::Queue::Unchecked"] + incoming = cnf["Dir::Queue::Unchecked"] os.chdir(incoming) # Remove a file to the morgue def remove (f): + fname = os.path.basename(f) if os.access(f, os.R_OK): - dest_filename = del_dir + '/' + os.path.basename(f) + Logger.log(["move file to morgue", fname, del_dir]) + if Options["Verbose"]: + print "Removing '%s' (to '%s')." % (fname, del_dir) + if Options["No-Action"]: + return + + dest_filename = os.path.join(del_dir, fname) # 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) + Logger.log(["change destination file name", os.path.basename(dest_filename)]) utils.move(f, dest_filename, 0660) else: - utils.warn("skipping '%s', permission denied." % (os.path.basename(f))) + Logger.log(["skipping file because of permission problem", fname]) + utils.warn("skipping '%s', permission denied." % fname) # Removes any old files. # [Used for Incoming/REJECT] # def flush_old (): + Logger.log(["check Incoming/REJECT for old files"]) 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(f)) - else: - if Options["Verbose"]: - print "Removing '%s' (to '%s')." % (os.path.basename(f), del_dir) - remove(f) + remove(f) else: if Options["Verbose"]: print "Skipping, too new, '%s'." % (os.path.basename(f)) @@ -115,6 +122,7 @@ def flush_orphans (): all_files = {} changes_files = [] + Logger.log(["check Incoming for old orphaned files"]) # Build up the list of all files in the directory for i in os.listdir('.'): if os.path.isfile(i): @@ -155,12 +163,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: - if Options["No-Action"]: - print "I: Would delete '%s'." % (os.path.basename(f)) - else: - if Options["Verbose"]: - print "Removing '%s' (to '%s')." % (os.path.basename(f), del_dir) - remove(f) + remove(f) else: if Options["Verbose"]: print "Skipping, too new, '%s'." % (os.path.basename(f)) @@ -168,15 +171,15 @@ def flush_orphans (): ################################################################################ def main (): - global Cnf, Options + global Options, Logger - Cnf = utils.get_conf() + cnf = Config() for i in ["Help", "Incoming", "No-Action", "Verbose" ]: - 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" + 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","Clean-Queues::Options::Help"), ('d',"days","Clean-Queues::Options::Days", "IntLevel"), @@ -184,25 +187,29 @@ def main (): ('n',"no-action","Clean-Queues::Options::No-Action"), ('v',"verbose","Clean-Queues::Options::Verbose")] - apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Clean-Queues::Options") + apt_pkg.ParseCommandLine(cnf.Cnf,Arguments,sys.argv) + Options = cnf.SubTree("Clean-Queues::Options") if Options["Help"]: usage() - init() + Logger = daklog.Logger(cnf, 'clean-queues', Options['No-Action']) + + init(cnf) if Options["Verbose"]: print "Processing incoming..." flush_orphans() - reject = Cnf["Dir::Queue::Reject"] + reject = cnf["Dir::Queue::Reject"] if os.path.exists(reject) and os.path.isdir(reject): if Options["Verbose"]: print "Processing incoming/REJECT..." os.chdir(reject) flush_old() + Logger.close() + ####################################################################################### if __name__ == '__main__': diff --git a/dak/rm.py b/dak/rm.py index fe763605..51400194 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -505,8 +505,8 @@ def main (): logfile.write("----------------------------------------------\n") logfile.flush() - dsc_type_id = get_override_type('dsc', session) - deb_type_id = get_override_type('deb', session) + dsc_type_id = get_override_type('dsc', session).overridetype_id + deb_type_id = get_override_type('deb', session).overridetype_id # Do the actual deletion print "Deleting...", diff --git a/daklib/changes.py b/daklib/changes.py index 59c7da17..ff232224 100755 --- a/daklib/changes.py +++ b/daklib/changes.py @@ -191,8 +191,8 @@ class Changes(object): self.dsc_files.update(p.load()) next_obj = p.load() - if type(next_obj) is DictType: - self.pkg.orig_files.update(next_obj) + if isinstance(next_obj, dict): + self.orig_files.update(next_obj) else: # Auto-convert old dak files to new format supporting # multiple tarballs diff --git a/daklib/dbconn.py b/daklib/dbconn.py index adecc38a..850c10d8 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -84,6 +84,7 @@ def session_wrapper(fn): # Session is last argument in args session = args[-1] if session is None: + args = list(args) session = args[-1] = DBConn().session() private_transaction = True @@ -1417,6 +1418,7 @@ class Queue(object): # them (if one doesn't already exist) for dsc_file in changes.dsc_files.keys(): # Skip all files except orig tarballs + from daklib.regexes import re_is_orig_source if not re_is_orig_source.match(dsc_file): continue # Skip orig files not identified in the pool diff --git a/daklib/queue.py b/daklib/queue.py index 25b40723..d217d7e4 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -73,7 +73,7 @@ def get_type(f, session): """ # Determine the type if f.has_key("dbtype"): - file_type = file["dbtype"] + file_type = f["dbtype"] elif re_source_ext.match(f["type"]): file_type = "dsc" else: