diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2020-03-27 13:57:32 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2020-03-27 14:01:08 -0400 |
| commit | c1417af54cf2cd037d5af98ec2272597ee8b9b22 (patch) | |
| tree | 7e5756ffcc54b08791fd2ef70e6257a9ae8973af | |
| parent | 82b0327fb2a509b388341aeffdbe2701444fa6ba (diff) | |
| download | b4-c1417af54cf2cd037d5af98ec2272597ee8b9b22.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__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/b4/__init__.py b/b4/__init__.py index ed9834b..a8da720 100644 --- a/b4/__init__.py +++ b/b4/__init__.py @@ -807,8 +807,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 |