os.chdir(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"]:
# [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))
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):
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))
# 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))
if Options["Help"]:
usage()
- Logger = daklog.Logger(cnf, 'clean-queues', Options['No-Action'])
+ Logger = daklog.Logger('clean-queues', Options['No-Action'])
init(cnf)