X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcheck_overrides.py;h=622067879f8cfa590077284062e4657aa4077df8;hb=e9db98a6b9c072bfd2cbcf34777219b8364f3a02;hp=a8e0f1d9eb6a172a4d1fa1629fd3690b8f6e57ed;hpb=0730e39dd59f8b699d5a2af9b4ca5aad66f0693b;p=dak.git

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index a8e0f1d9..62206787 100755
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -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()