]> err.no Git - dak/commitdiff
Ask the database for components
authorJoerg Jaspert <joerg@debian.org>
Sat, 11 Dec 2010 15:14:52 +0000 (16:14 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sat, 11 Dec 2010 15:14:52 +0000 (16:14 +0100)
Signed-off-by: Joerg Jaspert <joerg@debian.org>
dak/generate_filelist.py

index a2246f5cd3707dbf656886ffcee2bb356140064f..a58fe7e2c45d50288b9d135d82a716d58e319eb5 100755 (executable)
@@ -196,9 +196,11 @@ def main():
     suites = [suite.suite_name for suite in query_suites.all()]
     if not cnf.has_key('Filelist::Options::Suite'):
         cnf['Filelist::Options::Suite'] = ','.join(suites)
-    # we can ask the database for components if 'mixed' is gone
+    query_components = session.query(Component)
+    components = \
+        [component.component_name for component in query_components.all()]
     if not cnf.has_key('Filelist::Options::Component'):
-        cnf['Filelist::Options::Component'] = 'main,contrib,non-free'
+        cnf['Filelist::Options::Component'] = ','.join(components)
     query_architectures = session.query(Architecture)
     architectures = \
         [architecture.arch_string for architecture in query_architectures.all()]