From 435380da4b6772e82bf65702132d0075f951eefa Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Fri, 11 Feb 2022 10:18:36 +0000 Subject: [PATCH] Fix a typo in regexp --- main.go | 3 +++ parser.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index aa927dd..c3ef978 100644 --- a/main.go +++ b/main.go @@ -216,6 +216,9 @@ func dumpMessages(parser *Parser) { fmt.Printf("Message: %s", m.ID) if m.List != "" { fmt.Printf(" (list=%s)", m.List) + if m.MailmanHeldReason != "" { + fmt.Printf(" - held: %s", m.MailmanHeldReason) + } } fmt.Printf("\n\n") diff --git a/parser.go b/parser.go index f798f9b..191d851 100644 --- a/parser.go +++ b/parser.go @@ -261,8 +261,8 @@ var matcherSpecs = []struct { {progDovecot, `^lmtp\(([^\)]+)\)<[0-9]+><([^>]+)>: sieve: msgid=([^:]*):(?: .*:)? stored mail into mailbox '([^']*)'`, doSieve}, - {progMailman, `^(\w+) post from (\\S+) held, message-id=([^:]+): (.*)`, doMailmanHeld}, - {progMailman, `^Message discarded, msgid: ([^'#]*)#012.*list: ([^,]*),#012`, doMailmanDiscarded}, + {progMailman, `^(\w+) post from (\S+) held, message-id=([^:]+): (.*)`, doMailmanHeld}, + {progMailman, `^Message discarded, msgid: +([^'#]+)'?#012.*list: ([^,]*),#012`, doMailmanDiscarded}, {progMailman, `^post to (.+) from ([^,]*).*, message-id=([^,]*), success`, doMailmanPost}, } -- GitLab