X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Finit_dirs.py;h=d095eeee986b7bdb6093861eb81cda6a32deb79e;hb=cac810b4aeb8fa34c8ccaa7dc35b081efddc606b;hp=0d9eff29bea15776e6406091a967e2523656fb28;hpb=0428b537276f1c257c624183745e688e43fa6b06;p=dak.git

diff --git a/dak/init_dirs.py b/dak/init_dirs.py
index 0d9eff29..d095eeee 100755
--- a/dak/init_dirs.py
+++ b/dak/init_dirs.py
@@ -21,7 +21,7 @@
 
 import os, sys
 import apt_pkg
-import daklib.utils
+from daklib import utils
 
 ################################################################################
 
@@ -47,7 +47,7 @@ it."""
 
     if os.path.exists(target):
         if not os.path.isdir(target):
-            daklib.utils.fubar("%s (%s) is not a directory."
+            utils.fubar("%s (%s) is not a directory."
                                % (target, config_name))
     else:
         print "Creating %s ..." % (target)
@@ -55,14 +55,14 @@ it."""
 
 def process_file(config, config_name):
     """Create directories for a config entry that's a filename."""
-    
+
     if config.has_key(config_name):
         target = os.path.dirname(config[config_name])
         do_dir(target, config_name)
 
 def process_tree(config, tree):
     """Create directories for a config tree."""
-    
+
     for entry in config.SubTree(tree).List():
         entry = entry.lower()
         if tree == "Dir":
@@ -74,7 +74,7 @@ def process_tree(config, tree):
 
 def process_morguesubdir(subdir):
     """Create directories for morgue sub directories."""
-    
+
     config_name = "%s::MorgueSubDir" % (subdir)
     if Cnf.has_key(config_name):
         target = os.path.join(Cnf["Dir::Morgue"], Cnf[config_name])
@@ -118,7 +118,7 @@ def main ():
 
     global AptCnf, Cnf
 
-    Cnf = daklib.utils.get_conf()
+    Cnf = utils.get_conf()
     arguments = [('h', "help", "Init-Dirs::Options::Help")]
     for i in [ "help" ]:
         if not Cnf.has_key("Init-Dirs::Options::%s" % (i)):
@@ -130,11 +130,11 @@ def main ():
     if options["Help"]:
         usage()
     elif arguments:
-        daklib.utils.warn("dak init-dirs takes no arguments.")
+        utils.warn("dak init-dirs takes no arguments.")
         usage(exit_code=1)
 
     AptCnf = apt_pkg.newConfiguration()
-    apt_pkg.ReadConfigFileISC(AptCnf, daklib.utils.which_apt_conf_file())
+    apt_pkg.ReadConfigFileISC(AptCnf, utils.which_apt_conf_file())
 
     create_directories()
 
@@ -142,4 +142,3 @@ def main ():
 
 if __name__ == '__main__':
     main()
-