]> git.decadent.org.uk Git - dak.git/commitdiff
daklib/checks.py: include all not allowed binary architectures in error.
authorAnsgar Burchardt <ansgar@debian.org>
Sun, 16 Sep 2012 15:46:18 +0000 (17:46 +0200)
committerAnsgar Burchardt <ansgar@debian.org>
Sun, 16 Sep 2012 15:46:18 +0000 (17:46 +0200)
daklib/checks.py

index 81bd629e481e171991d1ddf0da8d3b4dce282c12..fcb5a325a7d53cde62998ebcab719ff10d1af01b 100644 (file)
@@ -389,9 +389,9 @@ class ACLCheck(Check):
                 uploaded_arches = set(upload.changes.architectures)
                 uploaded_arches.discard('source')
                 allowed_arches = set(a.arch_string for a in acl.architectures)
-                for a in uploaded_arches:
-                    if a not in allowed_arches:
-                        return False, "uploads for architecture {0} are not allowed".format(a)
+                forbidden_arches = uploaded_arches - allowed_arches
+                if len(forbidden_arches) != 0:
+                    return False, "uploads for architecture(s) {0} are not allowed".format(", ".join(forbidden_arches))
         if not acl.allow_hijack:
             for suite in upload.final_suites:
                 does_hijack, hijacked_binary, hijacked_from = self._does_hijack(session, upload, suite)