X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_queues.py;h=88b0bb9334a712228e2b2ae27ca2cf53f5e016f1;hb=03a86547e5d9b209016cc0b23f825d3baea92f8c;hp=f6964508a5b7e76a71f0c7347e5a0d441cdf44a1;hpb=0872b2e0b78670c91fd2bf0bda52e5761e079820;p=dak.git

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index f6964508..88b0bb93 100755
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -34,10 +34,12 @@
 ################################################################################
 
 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
 
 ################################################################################
 
@@ -65,22 +67,40 @@ Clean out incoming directories.
 def init (cnf):
     global delete_date, del_dir
 
+    # Used for directory naming
+    now_date = datetime.now()
+
+    # Used for working out times
     delete_date = int(time.time())-(int(Options["Days"])*84600)
-    date = time.strftime("%Y-%m-%d")
-    del_dir = os.path.join(cnf["Dir::Morgue"], cnf["Clean-Queues::MorgueSubDir"], date)
+
+    morguedir = cnf.get("Dir::Morgue", os.path.join("Dir::Pool", 'morgue'))
+    morguesubdir = cnf.get("Clean-Queues::MorgueSubDir", 'queue')
+
+    # Build directory as morguedir/morguesubdir/year/month/day
+    del_dir = os.path.join(morguedir,
+                           morguesubdir,
+                           str(now_date.year),
+                           '%.2d' % now_date.month,
+                           '%.2d' % now_date.day)
 
     # 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 = cnf["Dir::Queue::Unchecked"]
-    os.chdir(incoming)
+    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 as e:
+        utils.fubar("Cannot chdir to %s" % incoming)
 
 # Remove a file to the morgue
 def remove (from_dir, f):
@@ -97,7 +117,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)
@@ -136,7 +156,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 = {}
@@ -146,7 +166,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
@@ -187,13 +207,13 @@ 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()
 
-    Logger = daklog.Logger(cnf, 'clean-queues', Options['No-Action'])
+    Logger = daklog.Logger('clean-queues', Options['No-Action'])
 
     init(cnf)
 
@@ -201,10 +221,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()