X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fgenerate_releases.py;h=03081627dd27df5e29a0df2e0e61d5b5e0b20e53;hb=bfa8728e72eee4471a690da79c86efeba893218a;hp=fe843efa73831e1c5eecdc3651b0d4ef8acde087;hpb=09a1a20566dcf84ca229b4339bd8f8080eb59afd;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index fe843efa..03081627 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -98,7 +98,7 @@ def sign_release_dir(suite, dirname):
         # the array for consistency
         firstkey = True
 
-        for keyid in suite.signingkeys:
+        for keyid in suite.signingkeys or []:
             defkeyid = "--default-key %s" % keyid
 
             os.system("gpg %s %s %s --detach-sign <%s >>%s" %
@@ -156,6 +156,8 @@ class ReleaseWriter(object):
                 # TEMPORARY HACK HACK HACK until we change the way we store the suite names etc
                 if key == 'Suite' and getattr(suite, dbfield) == 'squeeze-updates':
                     out.write("Suite: stable-updates\n")
+                elif key == 'Suite' and getattr(suite, dbfield) == 'wheezy-updates':
+                    out.write("Suite: testing-updates\n")
                 else:
                     out.write("%s: %s\n" % (key, getattr(suite, dbfield)))
 
@@ -171,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 ))))
 
@@ -310,6 +310,7 @@ def main ():
         usage()
 
     Logger = daklog.Logger('generate-releases')
+    pool = DakProcessPool()
 
     session = DBConn().session()
 
@@ -330,8 +331,6 @@ def main ():
 
     broken=[]
 
-    pool = DakProcessPool()
-
     for s in suites:
         # Setup a multiprocessing Pool. As many workers as we have CPU cores.
         if s.untouchable and not Options["Force"]: