Merge branch 'master' into security

[dak.git] / dak / generate_filelist.py

diff --git a/dak/generate_filelist.py b/dak/generate_filelist.py
index f9e9dad6ed54c8d4e1a19bfb7aecbf7d4eabb806..a58fe7e2c45d50288b9d135d82a716d58e319eb5 100755 (executable)
--- a/dak/generate_filelist.py
+++ b/dak/generate_filelist.py
@@ -191,14 +191,17 @@ def main():
                  ('c', "component",    "Filelist::Options::Component", "HasArg"),
                  ('a', "architecture", "Filelist::Options::Architecture", "HasArg"),
                  ('i', "incremental",  "Filelist::Options::Incremental")]
-    query_suites = DBConn().session().query(Suite)
+    session = DBConn().session()
+    query_suites = session.query(Suite)
     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'
-    query_architectures = DBConn().session().query(Architecture)
+        cnf['Filelist::Options::Component'] = ','.join(components)
+    query_architectures = session.query(Architecture)
     architectures = \
         [architecture.arch_string for architecture in query_architectures.all()]
     if not cnf.has_key('Filelist::Options::Architecture'):
@@ -209,7 +212,6 @@ def main():
     Options = cnf.SubTree("Filelist::Options")
     if Options['Help']:
         usage()
-    session = DBConn().session()
     suite_arch = session.query(SuiteArchitecture)
     threadpool = ThreadPool()
     for suite_name in utils.split_args(Options['Suite']):