allow listing all s-a/a combinations and add a backref to make it easier

[dak.git] / dak / admin.py

diff --git a/dak/admin.py b/dak/admin.py
index 2bf6161724d93f2b3f743170d0e1a7513886c675..0f99bafc13f2ba6f7549b439dc3981d82033ce96 100755 (executable)
--- a/dak/admin.py
+++ b/dak/admin.py
@@ -92,7 +92,6 @@ def __architecture_add(d, args):
     if not dryrun:
         try:
             s = d.session()
-            s.begin()
             a = Architecture()
             a.arch_string = str(args[2]).lower()
             a.description = str(args[3])
@@ -119,7 +118,6 @@ def __architecture_rm(d, args):
     if not dryrun:
         try:
             s = d.session()
-            s.begin()
             a = get_architecture(args[2].lower(), s)
             if a is None:
                 die("E: Cannot find architecture %s" % args[2])
@@ -153,6 +151,13 @@ dispatch['a'] = architecture
 
 ################################################################################
 
+def __suite_architecture_list(d, args):
+    s = d.session()
+    suites = s.query(Suite).all()
+    for j in s.query(Suite).order_by('suite_name').all():
+        print j.suite_name + ' ' + \
+              ','.join([a.architecture.arch_string for a in j.suitearchitectures])
+
 def __suite_architecture_listarch(d, args):
     die_arglen(args, 3, "E: suite-architecture list-arch requires a suite")
     a = get_suite_architectures(args[2].lower())
@@ -182,7 +187,6 @@ def __suite_architecture_add(d, args):
 
     if not dryrun:
         try:
-            s.begin()
             sa = SuiteArchitecture()
             sa.arch_id = arch.arch_id
             sa.suite_id = suite.suite_id
@@ -203,7 +207,6 @@ def __suite_architecture_rm(d, args):
     s = d.session()
     if not dryrun:
         try:
-            s.begin()
             sa = get_suite_architecture(args[2].lower(), args[3].lower(), s)
             if sa is None:
                 die("E: can't find suite-architecture entry for %s, %s" % (args[2].lower(), args[3].lower()))
@@ -226,7 +229,9 @@ def suite_architecture(command):
 
     mode = args[1].lower()
 
-    if mode == 'list-arch':
+    if mode == 'list':
+        __suite_architecture_list(d, args)
+    elif mode == 'list-arch':
         __suite_architecture_listarch(d, args)
     elif mode == 'list-suite':
         __suite_architecture_listsuite(d, args)