Adjust to deal with the new Debian supplementaryGid

[dak.git] / dak / clean_queues.py

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index d947818c4612fef26f4e5d0c246b1c2cc0d8a66c..209591ac01b913d6eef2c2369e201b9ec579d231 100755 (executable)
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -39,7 +39,6 @@ import apt_pkg
 from daklib import utils
 from daklib import daklog
 from daklib.config import Config
-from daklib.dbconn import get_policy_queue
 
 ################################################################################
 
@@ -91,12 +90,11 @@ def init (cnf):
             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)