Convert exception handling to Python3 syntax.

[dak.git] / dak / clean_queues.py

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index 7ec6afb3dd19acc3f454f2bfefcde08fc4c40c11..6ade86c6a1c25e4e76a862d8b1a2f03e56072941 100755 (executable)
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -33,7 +33,7 @@
 
 ################################################################################
 
-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
@@ -67,9 +67,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')
@@ -98,7 +100,7 @@ def init (cnf):
 
     try:
         os.chdir(incoming)
-    except OSError, e:
+    except OSError as e:
         utils.fubar("Cannot chdir to %s" % incoming)
 
 # Remove a file to the morgue