X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcheck_overrides.py;h=15f944c85a6b9bba300ece3d4803b07e2551b943;hb=d729de9019b62e26eae3d24111af464e9bf30c64;hp=9caeef4a88bd2ab6ab9fe3cbbff986041d810e5f;hpb=7aaaad3135c9164390af5897925660842368660b;p=dak.git

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index 9caeef4a..15f944c8 100755
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -50,9 +50,9 @@
 
 import pg, sys, os
 import apt_pkg
-import dak.lib.database as database
-import dak.lib.logging as logging
-import dak.lib.utils as utils
+import daklib.database
+import daklib.logging
+import daklib.utils
 
 ################################################################################
 
@@ -84,26 +84,26 @@ def gen_blacklist(dir):
 def process(osuite, affected_suites, originosuite, component, type):
     global Logger, Options, projectB, sections, priorities
 
-    osuite_id = database.get_suite_id(osuite)
+    osuite_id = daklib.database.get_suite_id(osuite)
     if osuite_id == -1:
-        utils.fubar("Suite '%s' not recognised." % (osuite))
+        daklib.utils.fubar("Suite '%s' not recognised." % (osuite))
     originosuite_id = None
     if originosuite:
-        originosuite_id = database.get_suite_id(originosuite)
+        originosuite_id = daklib.database.get_suite_id(originosuite)
         if originosuite_id == -1:
-            utils.fubar("Suite '%s' not recognised." % (originosuite))
+            daklib.utils.fubar("Suite '%s' not recognised." % (originosuite))
 
-    component_id = database.get_component_id(component)
+    component_id = daklib.database.get_component_id(component)
     if component_id == -1:
-        utils.fubar("Component '%s' not recognised." % (component))
+        daklib.utils.fubar("Component '%s' not recognised." % (component))
 
-    type_id = database.get_override_type_id(type)
+    type_id = daklib.database.get_override_type_id(type)
     if type_id == -1:
-        utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (type))
-    dsc_type_id = database.get_override_type_id("dsc")
-    deb_type_id = database.get_override_type_id("deb")
+        daklib.utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (type))
+    dsc_type_id = daklib.database.get_override_type_id("dsc")
+    deb_type_id = daklib.database.get_override_type_id("deb")
 
-    source_priority_id = database.get_priority_id("source")
+    source_priority_id = daklib.database.get_priority_id("source")
 
     if type == "deb" or type == "udeb":
         packages = {}
@@ -138,7 +138,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
                 src_packages[package] = 1
             else:
                 if blacklist.has_key(package):
-                    utils.warn("%s in incoming, not touching" % package)
+                    daklib.utils.warn("%s in incoming, not touching" % package)
                     continue
                 Logger.log(["removing unused override", osuite, component,
                     type, package, priorities[i[1]], sections[i[2]], i[3]])
@@ -202,7 +202,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
 
         for package, hasoverride in src_packages.items():
             if not hasoverride:
-                utils.warn("%s has no override!" % package)
+                daklib.utils.warn("%s has no override!" % package)
 
     else: # binary override
         for i in q.getresult():
@@ -211,7 +211,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
                 packages[package] = 1
             else:
                 if blacklist.has_key(package):
-                    utils.warn("%s in incoming, not touching" % package)
+                    daklib.utils.warn("%s in incoming, not touching" % package)
                     continue
                 Logger.log(["removing unused override", osuite, component,
                     type, package, priorities[i[1]], sections[i[2]], i[3]])
@@ -256,7 +256,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
 
         for package, hasoverride in packages.items():
             if not hasoverride:
-                utils.warn("%s has no override!" % package)
+                daklib.utils.warn("%s has no override!" % package)
 
     projectB.query("COMMIT WORK")
     sys.stdout.flush()
@@ -267,7 +267,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
 def main ():
     global Logger, Options, projectB, sections, priorities
 
-    Cnf = utils.get_conf()
+    Cnf = daklib.utils.get_conf()
 
     Arguments = [('h',"help","Check-Overrides::Options::Help"),
                  ('n',"no-action", "Check-Overrides::Options::No-Action")]
@@ -281,7 +281,7 @@ def main ():
         usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    database.init(Cnf, projectB)
+    daklib.database.init(Cnf, projectB)
 
     # init sections, priorities:
     q = projectB.query("SELECT id, section FROM section")
@@ -292,9 +292,9 @@ def main ():
         priorities[i[0]] = i[1]
 
     if not Options["No-Action"]:
-        Logger = logging.Logger(Cnf, "check-overrides")
+        Logger = daklib.logging.Logger(Cnf, "check-overrides")
     else:
-        Logger = logging.Logger(Cnf, "check-overrides", 1)
+        Logger = daklib.logging.Logger(Cnf, "check-overrides", 1)
 
     gen_blacklist(Cnf["Dir::Queue::Accepted"])
 
@@ -329,7 +329,7 @@ def main ():
             suiteids.append(i[0])
             
         if len(suiteids) != len(suites) or len(suiteids) < 1:
-            utils.fubar("Couldn't find id's of all suites: %s" % suites)
+            daklib.utils.fubar("Couldn't find id's of all suites: %s" % suites)
 
         for component in Cnf.SubTree("Component").List():
             if component == "mixed":