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

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index fe843efa..798726bb 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)))
 
@@ -310,6 +312,7 @@ def main ():
         usage()
 
     Logger = daklog.Logger('generate-releases')
+    pool = DakProcessPool()
 
     session = DBConn().session()
 
@@ -330,8 +333,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"]: