[Qa-jenkins-scm] [jenkins.debian.net] 02/02: email2irc.py: further tweak the text parsing
Mattia Rizzolo
mattia at debian.org
Fri Apr 6 12:41:15 UTC 2018
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository jenkins.debian.net.
commit f33f385a19c34e6d49f4dfaac58f9c4f66ac8f10
Author: Mattia Rizzolo <mattia at debian.org>
Date: Fri Apr 6 14:40:53 2018 +0200
email2irc.py: further tweak the text parsing
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
bin/email2irc.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/email2irc.py b/bin/email2irc.py
index 5d7eb62..6cadd07 100755
--- a/bin/email2irc.py
+++ b/bin/email2irc.py
@@ -77,6 +77,7 @@ for part in message.walk():
# Get only the first line
fline = part.get_payload(decode=True).splitlines()[0]
fline = fline.decode('utf-8', errors='replace')
+ fline = ' '.join(fline.split()[:2])
break
else:
error('E: This email does not contain any text/plain part')
@@ -85,7 +86,8 @@ else:
# If we got this far, the message is good to go and we got everything we
# needed.
-ircmsg = '{} {}'.format(subject, fline)
+ircmsg = '{} {}'.format(subject.split(':', 1)[0], fline)
+ircmsg = re.sub(r'[<>]', r'', ircmsg)
ircmsg = re.sub(r'^Failure', r'Failed ', ircmsg)
ircmsg = re.sub(r'^Build failed in Jenkins', r'Failed ', ircmsg)
ircmsg = re.sub(r'^Jenkins build is back to (normal|stable)', r'Fixed ', ircmsg)
@@ -98,6 +100,7 @@ ircmsg = re.sub(r'Changes:', r'', ircmsg)
ircmsg = re.sub(r'\?page=changes$', r'', ircmsg)
ircmsg = re.sub(r'/(console|changes)$', r'', ircmsg)
ircmsg = re.sub(r'display/redirec.*\>$', r'', ircmsg)
+ircmsg = re.sub(r'/$', r'', ircmsg)
print('''
-----------
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list