X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_filelist.py;h=a4aba326f1e4c8d14d862b3f91515c364ec54280;hb=775fb9c4b2b92565e28adfaa5011af2f465a1dc5;hp=1a31ed310cd0e3812f32530355c104b30087ed3f;hpb=a1a83c8e96a52e669708b0c17cbaae33f87c805d;p=dak.git

diff --git a/dak/generate_filelist.py b/dak/generate_filelist.py
index 1a31ed31..a4aba326 100755
--- a/dak/generate_filelist.py
+++ b/dak/generate_filelist.py
@@ -181,7 +181,7 @@ Create filename lists for apt-ftparchive.
 ARCH, COMPONENT and SUITE can be comma (or space) separated list, e.g.
     --suite=testing,unstable
 
-Incremental mode appends only newer files to exising lists."""
+Incremental mode appends only newer files to existing lists."""
     sys.exit()
 
 def main():
@@ -191,25 +191,27 @@ 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)
-    suites = [suite.suite_name for suite in query_suites.all()]
+    session = DBConn().session()
+    query_suites = session.query(Suite)
+    suites = [suite.suite_name for suite in query_suites]
     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
+        cnf['Filelist::Options::Suite'] = ','.join(suites).encode()
+    query_components = session.query(Component)
+    components = \
+        [component.component_name for component in query_components]
     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).encode()
+    query_architectures = session.query(Architecture)
     architectures = \
-        [architecture.arch_string for architecture in query_architectures.all()]
+        [architecture.arch_string for architecture in query_architectures]
     if not cnf.has_key('Filelist::Options::Architecture'):
-        cnf['Filelist::Options::Architecture'] = ','.join(architectures)
+        cnf['Filelist::Options::Architecture'] = ','.join(architectures).encode()
     cnf['Filelist::Options::Help'] = ''
     cnf['Filelist::Options::Incremental'] = ''
     apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
     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']):