X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcheck_overrides.py;h=cdab644935f67a866408da210f087360235dd87c;hb=3a48d9bed2ff0984eee329153f4e158919a597ec;hp=15f944c85a6b9bba300ece3d4803b07e2551b943;hpb=e2ae71066cbb134753d7bfceb16e87d0b76dfd6e;p=dak.git

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
old mode 100755
new mode 100644
index 15f944c8..cdab6449
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -50,9 +50,9 @@
 
 import pg, sys, os
 import apt_pkg
-import daklib.database
-import daklib.logging
-import daklib.utils
+import daklib.database as database
+import daklib.logging as logging
+import daklib.utils as utils
 
 ################################################################################
 
@@ -84,26 +84,25 @@ def gen_blacklist(dir):
 def process(osuite, affected_suites, originosuite, component, type):
     global Logger, Options, projectB, sections, priorities
 
-    osuite_id = daklib.database.get_suite_id(osuite)
+    osuite_id = database.get_suite_id(osuite)
     if osuite_id == -1:
-        daklib.utils.fubar("Suite '%s' not recognised." % (osuite))
+        utils.fubar("Suite '%s' not recognised." % (osuite))
     originosuite_id = None
     if originosuite:
-        originosuite_id = daklib.database.get_suite_id(originosuite)
+        originosuite_id = database.get_suite_id(originosuite)
         if originosuite_id == -1:
-            daklib.utils.fubar("Suite '%s' not recognised." % (originosuite))
+            utils.fubar("Suite '%s' not recognised." % (originosuite))
 
-    component_id = daklib.database.get_component_id(component)
+    component_id = database.get_component_id(component)
     if component_id == -1:
-        daklib.utils.fubar("Component '%s' not recognised." % (component))
+        utils.fubar("Component '%s' not recognised." % (component))
 
-    type_id = daklib.database.get_override_type_id(type)
+    type_id = database.get_override_type_id(type)
     if type_id == -1:
-        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")
+        utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (type))
+    dsc_type_id = database.get_override_type_id("dsc")
 
-    source_priority_id = daklib.database.get_priority_id("source")
+    source_priority_id = database.get_priority_id("source")
 
     if type == "deb" or type == "udeb":
         packages = {}
@@ -112,7 +111,7 @@ SELECT b.package FROM binaries b, bin_associations ba, files f,
                               location l, component c
  WHERE b.type = '%s' AND b.id = ba.bin AND f.id = b.file AND l.id = f.location
    AND c.id = l.component AND ba.suite IN (%s) AND c.id = %s
-""" % (type, ",".join(map(str,affected_suites)), component_id))
+""" % (type, ",".join([ str(i) for i in affected_suites ]), component_id))
         for i in q.getresult():
             packages[i[0]] = 0
 
@@ -122,7 +121,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
                      component c
  WHERE s.id = sa.source AND f.id = s.file AND l.id = f.location
    AND c.id = l.component AND sa.suite IN (%s) AND c.id = %s
-""" % (",".join(map(str,affected_suites)), component_id))
+""" % (",".join([ str(i) for i in affected_suites]), component_id))
     for i in q.getresult():
         src_packages[i[0]] = 0
 
@@ -138,7 +137,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
                 src_packages[package] = 1
             else:
                 if blacklist.has_key(package):
-                    daklib.utils.warn("%s in incoming, not touching" % package)
+                    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]])
@@ -156,7 +155,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
             if not src_packages.has_key(package) or src_packages[package]:
                 continue
             src_packages[package] = 1
-            
+
             Logger.log(["add missing override", osuite, component,
                 type, package, "source", sections[i[2]], i[3]])
             if not Options["No-Action"]:
@@ -202,7 +201,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
 
         for package, hasoverride in src_packages.items():
             if not hasoverride:
-                daklib.utils.warn("%s has no override!" % package)
+                utils.warn("%s has no override!" % package)
 
     else: # binary override
         for i in q.getresult():
@@ -211,7 +210,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
                 packages[package] = 1
             else:
                 if blacklist.has_key(package):
-                    daklib.utils.warn("%s in incoming, not touching" % package)
+                    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 +255,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
 
         for package, hasoverride in packages.items():
             if not hasoverride:
-                daklib.utils.warn("%s has no override!" % package)
+                utils.warn("%s has no override!" % package)
 
     projectB.query("COMMIT WORK")
     sys.stdout.flush()
@@ -267,7 +266,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
 def main ():
     global Logger, Options, projectB, sections, priorities
 
-    Cnf = daklib.utils.get_conf()
+    Cnf = utils.get_conf()
 
     Arguments = [('h',"help","Check-Overrides::Options::Help"),
                  ('n',"no-action", "Check-Overrides::Options::No-Action")]
@@ -281,7 +280,7 @@ def main ():
         usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    daklib.database.init(Cnf, projectB)
+    database.init(Cnf, projectB)
 
     # init sections, priorities:
     q = projectB.query("SELECT id, section FROM section")
@@ -292,9 +291,9 @@ def main ():
         priorities[i[0]] = i[1]
 
     if not Options["No-Action"]:
-        Logger = daklib.logging.Logger(Cnf, "check-overrides")
+        Logger = logging.Logger(Cnf, "check-overrides")
     else:
-        Logger = daklib.logging.Logger(Cnf, "check-overrides", 1)
+        Logger = logging.Logger(Cnf, "check-overrides", 1)
 
     gen_blacklist(Cnf["Dir::Queue::Accepted"])
 
@@ -322,14 +321,14 @@ def main ():
                 suites.append(suite)
 
         q = projectB.query("SELECT id FROM suite WHERE suite_name in (%s)" \
-            % ", ".join(map(repr, suites)).lower())
+            % ", ".join([ repr(i) for i in suites ]).lower())
 
         suiteids = []
         for i in q.getresult():
             suiteids.append(i[0])
-            
+
         if len(suiteids) != len(suites) or len(suiteids) < 1:
-            daklib.utils.fubar("Couldn't find id's of all suites: %s" % suites)
+            utils.fubar("Couldn't find id's of all suites: %s" % suites)
 
         for component in Cnf.SubTree("Component").List():
             if component == "mixed":
@@ -351,4 +350,3 @@ def main ():
 
 if __name__ == '__main__':
     main()
-