merge ftpmaster branch

[dak.git] / dak / split_done.py

diff --git a/dak/split_done.py b/dak/split_done.py
old mode 100755 (executable)
new mode 100644 (file)
index 6b6d28f..2fc6c90
--- a/dak/split_done.py
+++ b/dak/split_done.py
@@ -19,26 +19,30 @@
 ################################################################################
 
 import glob, os, stat, time
-import dak.lib.utils
+import daklib.utils
 
 ################################################################################
 
 def main():
-    Cnf = dak.lib.utils.get_conf()
+    Cnf = daklib.utils.get_conf()
     count = 0
+    move_date = int(time.time())-(30*84600)
     os.chdir(Cnf["Dir::Queue::Done"])
     files = glob.glob("%s/*" % (Cnf["Dir::Queue::Done"]))
     for filename in files:
         if os.path.isfile(filename):
-            mtime = time.gmtime(os.stat(filename)[stat.ST_MTIME])
+            filemtime = os.stat(filename)[stat.ST_MTIME]
+            if filemtime > move_date:
+                continue
+            mtime = time.gmtime(filemtime)
             dirname = time.strftime("%Y/%m/%d", mtime)
             if not os.path.exists(dirname):
                 print "Creating: %s" % (dirname)
                 os.makedirs(dirname)
             dest = dirname + '/' + os.path.basename(filename)
             if os.path.exists(dest):
-                dak.lib.utils.fubar("%s already exists." % (dest))
-            print "Move: %s -> %s" % (filename, dest) 
+                daklib.utils.fubar("%s already exists." % (dest))
+            print "Move: %s -> %s" % (filename, dest)
             os.rename(filename, dest)
             count = count + 1
     print "Moved %d files." % (count)