Use "import daklib.foo as foo" style

[dak.git] / dak / make_overrides.py

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 40ca41ed2fe946d6b3eb1ba4d11005053c00e981..77e7bb8c885049a562ca57374248b1845863c11b 100755 (executable)
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -27,8 +27,8 @@
 
 import pg, sys
 import apt_pkg
-import dak.lib.database as database
-import dak.lib.utils as utils
+import daklib.database as database
+import daklib.utils as utils
 
 ################################################################################
 
@@ -86,12 +86,12 @@ def main ():
     Cnf = utils.get_conf()
     Arguments = [('h',"help","Make-Overrides::Options::Help")]
     for i in [ "help" ]:
-       if not Cnf.has_key("Make-Overrides::Options::%s" % (i)):
-           Cnf["Make-Overrides::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Make-Overrides::Options::%s" % (i)):
+            Cnf["Make-Overrides::Options::%s" % (i)] = ""
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
     Options = Cnf.SubTree("Make-Overrides::Options")
     if Options["Help"]:
-       usage()
+        usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
     database.init(Cnf, projectB)
@@ -110,12 +110,12 @@ def main ():
                 if otype == "deb":
                     suffix = ""
                 elif otype == "udeb":
-                    if component != "main":
+                    if component == "contrib":
                         continue; # Ick2
                     suffix = ".debian-installer"
                 elif otype == "dsc":
                     suffix = ".src"
-                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), suffix)
+                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component, suffix)
                 output_file = utils.open_file(filename, 'w')
                 do_list(output_file, suite, component, otype)
                 output_file.close()