X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_queues.py;h=209591ac01b913d6eef2c2369e201b9ec579d231;hb=026bdb9580e6d18bf504d2f44d46890df5d89f1a;hp=7ec6afb3dd19acc3f454f2bfefcde08fc4c40c11;hpb=76f46e1db6aea842c031e93e482772364bd99c10;p=dak.git

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index 7ec6afb3..209591ac 100755
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -33,13 +33,12 @@
 
 ################################################################################
 
-import os, os.path, stat, sys
+import os, os.path, stat, sys, time
 from datetime import datetime, timedelta
 import apt_pkg
 from daklib import utils
 from daklib import daklog
 from daklib.config import Config
-from daklib.dbconn import get_policy_queue
 
 ################################################################################
 
@@ -67,9 +66,11 @@ Clean out incoming directories.
 def init (cnf):
     global delete_date, del_dir
 
+    # Used for directory naming
     now_date = datetime.now()
 
-    delete_date = now_date - timedelta(seconds=int(Options["Days"]) * 84600)
+    # Used for working out times
+    delete_date = int(time.time())-(int(Options["Days"])*84600)
 
     morguedir = cnf.get("Dir::Morgue", os.path.join("Dir::Pool", 'morgue'))
     morguesubdir = cnf.get("Clean-Queues::MorgueSubDir", 'queue')
@@ -84,21 +85,20 @@ def init (cnf):
     # 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_queue = get_policy_queue('unchecked')
-        if not incoming_queue:
-            utils.fubar("Cannot find 'unchecked' queue")
-        incoming = incoming_queue.path
+    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, e:
+    except OSError as e:
         utils.fubar("Cannot chdir to %s" % incoming)
 
 # Remove a file to the morgue
@@ -116,7 +116,7 @@ def remove (from_dir, 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)
@@ -155,7 +155,7 @@ 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 = {}
@@ -165,7 +165,7 @@ def flush_orphans ():
                     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
@@ -206,8 +206,8 @@ 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()