From 9496a6e8fc4682676b016c83c41c358deabbab9b Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Wed, 9 Jun 2021 11:41:04 -0400 Subject: Fix sloppy trailer handling When returning sloppy trailers, make sure we always return a 4-member list, which includes the provenant LoreMessage itself. Reported-by: Greg Kroah-Hartman Signed-off-by: Konstantin Ryabitsev --- b4/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/b4/__init__.py b/b4/__init__.py index cad22b7..d69f80e 100644 --- a/b4/__init__.py +++ b/b4/__init__.py @@ -929,13 +929,11 @@ class LoreMessage: self.trailers.append(trailer) def get_trailers(self, sloppy=False): + trailers = list() mismatches = set() - if sloppy: - return self.trailers, mismatches - trailers = list() for tname, tvalue, extdata in self.trailers: - if tname.lower() in ('fixes', 'obsoleted-by'): + if sloppy or tname.lower() in ('fixes', 'obsoleted-by'): trailers.append((tname, tvalue, extdata, self)) continue -- cgit v1.2.3