Merge branch 'master' into security

[dak.git] / dak / split_done.py

diff --git a/dak/split_done.py b/dak/split_done.py
index 0579f043f25f78d428a07f8084df7648bb1170af..5f8faddaf8e4041e05fffdc1b0ef7915ed91547b 100755 (executable)
--- a/dak/split_done.py
+++ b/dak/split_done.py
@@ -19,12 +19,12 @@
 ################################################################################
 
 import glob, os, stat, time
-import daklib.utils
+from daklib import utils
 
 ################################################################################
 
 def main():
-    Cnf = daklib.utils.get_conf()
+    Cnf = utils.get_conf()
     count = 0
     move_date = int(time.time())-(30*84600)
     os.chdir(Cnf["Dir::Queue::Done"])
@@ -41,8 +41,8 @@ def main():
                 os.makedirs(dirname)
             dest = dirname + '/' + os.path.basename(filename)
             if os.path.exists(dest):
-                daklib.utils.fubar("%s already exists." % (dest))
-            print "Move: %s -> %s" % (filename, dest) 
+                utils.fubar("%s already exists." % (dest))
+            print "Move: %s -> %s" % (filename, dest)
             os.rename(filename, dest)
             count = count + 1
     print "Moved %d files." % (count)