Deal with dupe follow-up trailers sent to cover

Since we now include the message object into the followup-trailer list
(for DKIM verification purposes), we no longer auto-dedupe duplicate
trailers. Add some extra logic to handle that.

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/b4/mbox.py b/b4/mbox.py
index c0b47e2..200cf1c 100644
--- a/b4/mbox.py
+++ b/b4/mbox.py
@@ -129,8 +129,11 @@ def mbox_to_am(mboxfile, cmdargs):
         # Warn that some trailers were sent to the cover letter
         logger.critical('---')
         logger.critical('NOTE: Some trailers were sent to the cover letter:')
+        tseen = set()
         for trailer in lser.patches[0].followup_trailers:
-            logger.critical('      %s: %s', trailer[0], trailer[1])
+            if tuple(trailer[:2]) not in tseen:
+                logger.critical('      %s: %s', trailer[0], trailer[1])
+                tseen.add(tuple(trailer[:2]))
         logger.critical('NOTE: Rerun with -t to apply them to all patches')
     if len(lser.trailer_mismatches):
         logger.critical('---')