]> git.decadent.org.uk Git - dak.git/commitdiff
Fix reject message generation
authorMark Hymers <mhy@debian.org>
Thu, 24 Mar 2011 11:05:29 +0000 (11:05 +0000)
committerMark Hymers <mhy@debian.org>
Thu, 24 Mar 2011 11:05:29 +0000 (11:05 +0000)
Signed-off-by: Mark Hymers <mhy@debian.org>
daklib/queue.py

index 549d45bfaec5f0d9cb6b5b4dfe480521f88c47b8..df5ee6a645edebfac66bf09dd9de1f7a26da1a47 100755 (executable)
@@ -1746,8 +1746,11 @@ class Upload(object):
 
         if len(tmparches.keys()) > 0:
             if fpr.binary_reject:
-                rej = ".changes file contains files of architectures not permitted for fingerprint %s" % fpr.fingerprint
-                rej += "\narchitectures involved are: ", ",".join(tmparches.keys())
+                rej = "changes file contains files of architectures not permitted for fingerprint %s" % fpr.fingerprint
+                if len(tmparches.keys()) == 1:
+                    rej += "\n\narchitecture involved is: %s" % ",".join(tmparches.keys())
+                else:
+                    rej += "\n\narchitectures involved are: %s" % ",".join(tmparches.keys())
                 self.rejects.append(rej)
             else:
                 # TODO: This is where we'll implement reject vs throw away binaries later