aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-03-27 13:57:32 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-03-27 13:57:32 -0400
commita3717765deccb47caca44589bd4b238a1b3e661e (patch)
treed52ff8f6d8fb796201bc1ca1d08936e77053ea28
parent3d1784d4ef3e6fa5d5ed224c92cd74dde4e5e87f (diff)
downloadb4-a3717765deccb47caca44589bd4b238a1b3e661e.tar.gz
We do want to use a list when sorting trailers
Switching to using sets for all trailer management resulted in trailer order being non-deterministic for trailers with the same title. Switch back to using lists where it makes a difference. Reported-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rw-r--r--b4/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/b4/__init__.py b/b4/__init__.py
index af8b23c..0f0b76c 100644
--- a/b4/__init__.py
+++ b/b4/__init__.py
@@ -817,8 +817,7 @@ class LoreMessage:
# Now we add mix-in trailers
btrailers.reverse()
- trailers = set(self.followup_trailers)
- trailers.update(set(btrailers))
+ trailers = btrailers + list(self.followup_trailers)
added = list()
if trailer_order is None:
trailer_order = DEFAULT_TRAILER_ORDER