import dak.lib.foo as foo for library modules.

[dak.git] / dak / compare_suites.py

diff --git a/dak/compare_suites.py b/dak/compare_suites.py
index 0eb458a6c0948d2e74e2d11a1d592a9d0866a251..c5be26638594d24a2a0320b14eb8d211e7e121c2 100755 (executable)
--- a/dak/compare_suites.py
+++ b/dak/compare_suites.py
@@ -21,8 +21,9 @@
 ################################################################################
 
 import pg, sys
-import dak.lib.utils, dak.lib.database
 import apt_pkg
+import dak.lib.database as database
+import dak.lib.utils as utils
 
 ################################################################################
 
@@ -43,7 +44,7 @@ Looks for fixable descrepancies between stable and unstable.
 def main ():
     global Cnf, projectB
 
-    Cnf = dak.lib.utils.get_conf()
+    Cnf = utils.get_conf()
     Arguments = [('h',"help","Compare-Suites::Options::Help")]
     for i in [ "help" ]:
        if not Cnf.has_key("Compare-Suites::Options::%s" % (i)):
@@ -56,15 +57,15 @@ def main ():
        usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    dak.lib.database.init(Cnf, projectB)
+    database.init(Cnf, projectB)
 
     src_suite = "stable"
     dst_suite = "unstable"
 
-    src_suite_id = dak.lib.database.get_suite_id(src_suite)
-    dst_suite_id = dak.lib.database.get_suite_id(dst_suite)
-    arch_all_id = dak.lib.database.get_architecture_id("all")
-    dsc_type_id = dak.lib.database.get_override_type_id("dsc")
+    src_suite_id = database.get_suite_id(src_suite)
+    dst_suite_id = database.get_suite_id(dst_suite)
+    arch_all_id = database.get_architecture_id("all")
+    dsc_type_id = database.get_override_type_id("dsc")
 
     for arch in Cnf.ValueList("Suite::%s::Architectures" % (src_suite)):
         if arch == "source":
@@ -76,7 +77,7 @@ def main ():
 
         if arch == "all":
             continue
-        arch_id = dak.lib.database.get_architecture_id(arch)
+        arch_id = database.get_architecture_id(arch)
         q = projectB.query("""
 SELECT b_src.package, b_src.version, a.arch_string
   FROM binaries b_src, bin_associations ba, override o, architecture a