Prefer interpolation over concatenation here.

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index a539e54788c3de15b3effdf65469191c7b5a73ef..edd14d7e231b4d1ca2c54aa25502024e877a7ce7 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -290,16 +290,13 @@ class Upload(object):
         msg = ''
 
         if len(self.rejects) > 0:
-            msg += "Reject Reasons:\n"
-            msg += "\n".join(self.rejects)
+            msg += "\n\nReject Reasons:\n%s" % "\n".join(self.rejects)
 
         if len(self.warnings) > 0:
-            msg += "Warnings:\n"
-            msg += "\n".join(self.warnings)
+            msg += "\n\nWarnings:\n%s" % "\n".join(self.warnings)
 
         if len(self.notes) > 0:
-            msg += "Notes:\n"
-            msg += "\n".join(self.notes)
+            msg += "\n\nNotes:\n%s" % "\n".join(self.notes)
 
         return msg
 
@@ -1378,14 +1375,16 @@ class Upload(object):
                 elif etag in lintiantags['error']:
                     # The tag is overriden - but is not allowed to be
                     self.rejects.append("%s: Overriden tag %s found, but this tag may not be overwritten." % (epackage, etag))
-                    log("overidden tag is overridden", etag)
+                    log("ftpmaster does not allow tag to be overridable", etag)
             else:
                 # Tag is known, it is not overriden, direct reject.
                 self.rejects.append("%s: Found lintian output: '%s %s', automatically rejected package." % (epackage, etag, etext))
-                log("auto rejecting", etag)
                 # Now tell if they *might* override it.
                 if etag in lintiantags['warning']:
+                    log("auto rejecting", "overridable", etag)
                     self.rejects.append("%s: If you have a good reason, you may override this lintian tag." % (epackage))
+                else:
+                    log("auto rejecting", "not overridable", etag)
 
     ###########################################################################
     def check_urgency(self):