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

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
old mode 100755
new mode 100644
index 9caeef4a..cdab6449
--- 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 as database
+import daklib.logging as logging
+import daklib.utils as utils
 
 ################################################################################
 
@@ -101,7 +101,6 @@ def process(osuite, affected_suites, originosuite, component, 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")
 
     source_priority_id = database.get_priority_id("source")
 
@@ -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
 
@@ -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"]:
@@ -322,12 +321,12 @@ 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:
             utils.fubar("Couldn't find id's of all suites: %s" % suites)
 
@@ -351,4 +350,3 @@ def main ():
 
 if __name__ == '__main__':
     main()
-