Merge commit 'godog/master' into merge

[dak.git] / dak / clean_queues.py

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index 51d6b3b7fdf49e6b84fc2d5690412db160ab6d48..34d90473a1b345715996029b6bb50ad2541b317c 100755 (executable)
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Clean incoming of old unused files
+""" Clean incoming of old unused files """
 # Copyright (C) 2000, 2001, 2002, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 
 import os, stat, sys, time
 import apt_pkg
-import dak.lib.utils as utils
+from daklib import utils
 
 ################################################################################
 
@@ -81,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]
@@ -132,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
@@ -153,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))
 
 ################################################################################
 
@@ -173,10 +173,10 @@ def main ():
     Cnf = utils.get_conf()
 
     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::%s" % (i)):
+            Cnf["Clean-Queues::Options::%s" % (i)] = ""
     if not Cnf.has_key("Clean-Queues::Options::Days"):
-       Cnf["Clean-Queues::Options::Days"] = "14"
+        Cnf["Clean-Queues::Options::Days"] = "14"
 
     Arguments = [('h',"help","Clean-Queues::Options::Help"),
                  ('d',"days","Clean-Queues::Options::Days", "IntLevel"),
@@ -188,7 +188,7 @@ def main ():
     Options = Cnf.SubTree("Clean-Queues::Options")
 
     if Options["Help"]:
-       usage()
+        usage()
 
     init()