Add ordering to component table and use this when checking policy

[dak.git] / daklib / policy.py

diff --git a/daklib/policy.py b/daklib/policy.py
index cdff56a7e0fe2a306b58b41fe3db7c922d4d36f4..aeed9a2c19cbfb679274520e3418a73f42dc3722 100644 (file)
--- a/daklib/policy.py
+++ b/daklib/policy.py
@@ -279,13 +279,18 @@ class PolicyQueueUploadHandler(object):
                             ))
             components.add(component)
 
+        source = self.upload.source
         source_component = '(unknown)'
-        for component in ('main', 'contrib', 'non-free'):
+        for component, in self.session.query(Component.component_name).order_by(Component.ordering):
             if component in components:
                 source_component = component
                 break
+            else:
+                if source is not None:
+                    if self._source_override(component) is not None:
+                        source_component = component
+                        break
 
-        source = self.upload.source
         if source is not None:
             override = self._source_override(source_component)
             if override is None: