aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-11-27 10:58:08 -0500
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-11-27 10:58:08 -0500
commit3c53de2fce73baf911c3c8290791af7d5ced3f21 (patch)
tree61c148ea5728878c8661d18524d486c5b6926add
parentd9d9d4eee641cd007487a7f5c4defd71f2d21ee8 (diff)
downloadkorg-helpers-3c53de2fce73baf911c3c8290791af7d5ced3f21.tar.gz
Be more conservative assuming mbx format
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rwxr-xr-xlist-archive-collector.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/list-archive-collector.py b/list-archive-collector.py
index 810fb4e..f7de703 100755
--- a/list-archive-collector.py
+++ b/list-archive-collector.py
@@ -339,11 +339,10 @@ def grab_pipermail_archive(pipermail_url, mbx, listid, toaddr, lookaside, checks
mboxdata = re.sub(regex, subst, mboxdata, 0, flags=re.M)
regex = r'^>?(From:? \S+) at (\S+\..*)'
mboxdata = re.sub(regex, subst, mboxdata, 0, flags=re.M)
- else:
- # Fix any remaining false From escapes
- regex = r'^>(From\s+\S+@\S+\s+\w+\s+\w+\s+\d+\s+\d+:\d+:\d+\s+\d{4})'
- subst = r'\1'
- mboxdata = re.sub(regex, subst, mboxdata, 0, flags=re.M)
+ # Fix any remaining false From escapes
+ regex = r'^>(From\s+\S+@\S+\s+\w+\s+\w+\s+\d+\s+\d+:\d+:\d+\s+\d{4})'
+ subst = r'\1'
+ mboxdata = re.sub(regex, subst, mboxdata, 0, flags=re.M)
with open(tmpfile, 'wb') as out_fh:
out_fh.write(mboxdata.encode())