X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=72fb4304e1b99571e05bcebc5789b9a7ab1c1cd6;hb=a678233656faab3bf616081c4eda7a62bc876a89;hp=a57c5fc22143047628dd87dd1c1d440064899c6e;hpb=aa4f71d8e30c23e458a8148be258c89bffbd405f;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index a57c5fc2..72fb4304 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -60,6 +60,7 @@ def usage (exit_code=0):
     print """Usage: dak generate-releases [OPTIONS]
 Generate the Release files
 
+  -a, --archive=ARCHIVE      process suites in ARCHIVE
   -s, --suite=SUITE(s)       process this suite
                              Default: All suites not marked 'untouchable'
   -f, --force                Allow processing of untouchable suites
@@ -97,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" %
@@ -297,6 +298,7 @@ def main ():
             cnf["Generate-Releases::Options::%s" % (i)] = ""
 
     Arguments = [('h',"help","Generate-Releases::Options::Help"),
+                 ('a','archive','Generate-Releases::Options::Archive','HasArg'),
                  ('s',"suite","Generate-Releases::Options::Suite"),
                  ('f',"force","Generate-Releases::Options::Force"),
                  ('o','option','','ArbItem')]
@@ -321,7 +323,10 @@ def main ():
                 print "cannot find suite %s" % s
                 Logger.log(['cannot find suite %s' % s])
     else:
-        suites = session.query(Suite).filter(Suite.untouchable == False).all()
+        query = session.query(Suite).filter(Suite.untouchable == False)
+        if 'Archive' in Options:
+            query = query.join(Suite.archive).filter(Archive.archive_name==Options['Archive'])
+        suites = query.all()
 
     broken=[]