From: Mark Hymers <mhy@debian.org>
Date: Wed, 27 Jul 2011 17:17:51 +0000 (+0100)
Subject: Merge remote branch 'mhy/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=7251cf5c1327938c02423fc933615dbb97675d2b;hp=717f343ebc3c5994b39aa03ccc7035f14faaa9e7

Merge remote branch 'mhy/master'
---

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index 523cdefe..62206787 100755
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -369,9 +369,10 @@ 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
+            component_name = component.component_name
             otypes = ['dsc']
             for ot in session.query(OverrideType):
                 if ot.overridetype == 'dsc':
@@ -380,9 +381,9 @@ def main ():
 
             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()