X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_queues.py;h=1123494bb7f580ce6a3de538b810ce811c8bda61;hb=26b64147278c9a69ec31c2dcf64c26f5e7cec57b;hp=474fe390cacbb1dbdcc36da812bf44f8715e78bf;hpb=50db22ea5f288daa39f81138a41a509d9a41cc3e;p=dak.git

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index 474fe390..1123494b 100755
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -38,6 +38,7 @@ import apt_pkg
 from daklib import utils
 from daklib import daklog
 from daklib.config import Config
+from daklib.dbconn import get_policy_queue
 
 ################################################################################
 
@@ -79,8 +80,15 @@ def init (cnf):
     # Move to the directory to clean
     incoming = Options["Incoming"]
     if incoming == "":
-        incoming = cnf["Dir::Queue::Unchecked"]
-    os.chdir(incoming)
+        incoming_queue = get_policy_queue('unchecked')
+        if not incoming_queue:
+            utils.fubar("Cannot find 'unchecked' queue")
+        incoming = incoming_queue.path
+
+    try:
+        os.chdir(incoming)
+    except OSError, e:
+        utils.fubar("Cannot chdir to %s" % incoming)
 
 # Remove a file to the morgue
 def remove (from_dir, f):
@@ -201,10 +209,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()