Merge remote branch 'ftpmaster/master'

[dak.git] / dak / check_overrides.py

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index 7c924649deaed4a716ea8b583b04f0507fe970e3..622067879f8cfa590077284062e4657aa4077df8 100755 (executable)
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -341,9 +341,9 @@ def main ():
         priorities[entry] = name
 
     if not Options["No-Action"]:
-        Logger = daklog.Logger(cnf, "check-overrides")
+        Logger = daklog.Logger("check-overrides")
     else:
-        Logger = daklog.Logger(cnf, "check-overrides", 1)
+        Logger = daklog.Logger("check-overrides", 1)
 
     for osuite in cnf.SubTree("Check-Overrides::OverrideSuites").List():
         if "1" != cnf["Check-Overrides::OverrideSuites::%s::Process" % osuite]:
@@ -369,17 +369,21 @@ def main ():
         if len(suiteids) < 1:
             utils.fubar("Couldn't find id's of all suites: %s" % suiteids)
 
-        for component in cnf.SubTree("Component").List():
+        for component in session.query(Component).all():
             # It is crucial for the dsc override creation based on binary
             # overrides that 'dsc' goes first
-            otypes = cnf.ValueList("OverrideType")
-            otypes.remove("dsc")
-            otypes = ["dsc"] + otypes
+            component_name = component.component_name
+            otypes = ['dsc']
+            for ot in session.query(OverrideType):
+                if ot.overridetype == 'dsc':
+                    continue
+                otypes.append(ot.overridetype)
+
             for otype in otypes:
                 print "Processing %s [%s - %s]" \
-                    % (osuite, component, otype)
+                    % (osuite, component_name, otype)
                 sys.stdout.flush()
-                process(osuite, suiteids, originosuite, component, otype, session)
+                process(osuite, suiteids, originosuite, component_name, otype, session)
 
     Logger.close()