[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] Fix reject message generation



Signed-off-by: Mark Hymers <mhy@debian.org>
---
 daklib/queue.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/daklib/queue.py b/daklib/queue.py
index 549d45b..df5ee6a 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
-- 
1.7.2.5


Reply to: