From: Mark Hymers <mhy@debian.org>
Date: Thu, 24 Mar 2011 11:05:29 +0000 (+0000)
Subject: Fix reject message generation
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=93b984f622111a219b0db0bee2ab7292ac0db654;p=dak.git

Fix reject message generation

Signed-off-by: Mark Hymers <mhy@debian.org>
---

diff --git a/daklib/queue.py b/daklib/queue.py
index 549d45bf..df5ee6a6 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -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