Add src_formats by default

[dak.git] / dak / admin.py

diff --git a/dak/admin.py b/dak/admin.py
index 2183c2293b2ad4c039d1658362b1f72ad318c22b..5f0dcc9eeda8848c22ddb4b5536bd7bd647900e7 100755 (executable)
--- a/dak/admin.py
+++ b/dak/admin.py
@@ -80,8 +80,10 @@ Perform administrative work on the dak database.
      s show SUITE           show config details for a suite
      s add SUITE VERSION [ label=LABEL ] [ description=DESCRIPTION ]
                          [ origin=ORIGIN ] [ codename=CODENAME ]
-                            add suite SUITE, version VERSION. label,
-                            description, origin and codename are optional.
+                         [ signingkey=SIGNINGKEY ]
+                            add suite SUITE, version VERSION.
+                            label, description, origin, codename
+                            and signingkey are optional.
 
      s add-all-arches SUITE VERSION... as "s add" but adds suite-architecture
                             relationships for all architectures
@@ -219,8 +221,17 @@ def __suite_add(d, args, addallarches=False):
             suite.description = get_field('description')
             suite.origin = get_field('origin')
             suite.codename = get_field('codename')
+            signingkey = get_field('signingkey')
+            if signingkey is not None:
+                suite.signingkeys = [signingkey.upper()]
             s.add(suite)
             s.flush()
+            for sf in s.query(SrcFormat).all():
+                ssf = SuiteSrcFormat()
+                ssf.suite = suite
+                ssf.src_format = sf
+                s.add(ssf)
+                s.flush()
         except IntegrityError, e:
             die("E: Integrity error adding suite %s (it probably already exists)" % suite_name)
         except SQLAlchemyError, e: