Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

[dak.git] / dak / check_overrides.py

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index 5cccfb6bbf07a6a69e2026db1f330d1b25d8a86b..2987f9be10978ff58a2abc22f287a92d8bfb47e7 100755 (executable)
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -77,11 +77,6 @@ Check for cruft in overrides.
 
 ################################################################################
 
-def gen_blacklist(dir):
-    for entry in os.listdir(dir):
-        entry = entry.split('_')[0]
-        blacklist[entry] = 1
-
 def process(osuite, affected_suites, originosuite, component, otype, session):
     global Logger, Options, sections, priorities
 
@@ -288,7 +283,7 @@ SELECT s.source FROM source s, src_associations sa, files f, location l,
                 # we can copy
                 packages[package] = 1
                 Logger.log(["copying missing override", osuite, component,
-                    type, package, priorities[i[1]], sections[i[2]], i[3]])
+                    otype, package, priorities[i[1]], sections[i[2]], i[3]])
                 if not Options["No-Action"]:
                     session.execute("""INSERT INTO override (package, suite, component,
                                                              priority, section, type, maintainer)
@@ -342,8 +337,6 @@ def main ():
     else:
         Logger = daklog.Logger(cnf, "check-overrides", 1)
 
-    gen_blacklist(cnf["Dir::Queue::Accepted"])
-
     for osuite in cnf.SubTree("Check-Overrides::OverrideSuites").List():
         if "1" != cnf["Check-Overrides::OverrideSuites::%s::Process" % osuite]:
             continue