]> err.no Git - dak/commitdiff
dak/generate_releases.py: pull components from the database
authorTollef Fog Heen <tfheen@varnish-software.com>
Tue, 27 Nov 2012 10:13:33 +0000 (11:13 +0100)
committerAnsgar Burchardt <ansgar@debian.org>
Sat, 1 Dec 2012 16:33:51 +0000 (17:33 +0100)
Address FIXME that talks about pulling Components from the DB.

Signed-off-by: Tollef Fog Heen <tfheen@varnish-software.com>
Signed-off-by: Ansgar Burchardt <ansgar@debian.org>
dak/generate_releases.py

index 798726bb9ec887b2c9c6146415b0a4e06cc7de43..03081627dd27df5e29a0df2e0e61d5b5e0b20e53 100755 (executable)
@@ -173,9 +173,7 @@ class ReleaseWriter(object):
 
         out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures])))
 
-        ## FIXME: Components need to be adjusted to whatever will be in the db
-        ## Needs putting in the DB
-        components = ['main', 'contrib', 'non-free']
+        components = [ c.component_name for c in session.query(Component) ]
 
         out.write("Components: %s\n" % ( " ".join(map(lambda x: "%s%s" % (suite_suffix, x), components ))))