make-changelog: do not move to next element on unpack error

[dak.git] / dak / admin.py

diff --git a/dak/admin.py b/dak/admin.py
index 316b62b54d36da67b53a55c142ca3b75872b1f4c..c7d770bae71ac7f8f4231f400236e3a4e6bd0dc4 100755 (executable)
--- a/dak/admin.py
+++ b/dak/admin.py
@@ -77,6 +77,7 @@ Perform administrative work on the dak database.
                             description, origin and codename are optional.
 
   suite-architecture / s-a:
+     s-a list               show the architectures for all suites
      s-a list-suite ARCH    show the suites an ARCH is in
      s-a list-arch SUITE    show the architectures in a SUITE
      s-a add SUITE ARCH     add ARCH to suite
@@ -232,9 +233,10 @@ dispatch['s'] = suite
 
 def __suite_architecture_list(d, args):
     s = d.session()
-    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])
+    for j in s.query(Suite).order_by('suite_name'):
+        architectures = j.get_architectures(skipsrc = True, skipall = True)
+        print j.suite_name + ': ' + \
+              ', '.join([a.arch_string for a in architectures])
 
 def __suite_architecture_listarch(d, args):
     die_arglen(args, 3, "E: suite-architecture list-arch requires a suite")