[Qa-jenkins-scm] [jenkins.debian.net] 01/01: email2irc: some more tweaks…

[Mattia Rizzolo]

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 b1bd6b993c9c7a11cacf7234fc84b4a5332e975e
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Apr 6 14:48:11 2018 +0200

    email2irc: some more tweaks…
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 bin/email2irc.py | 2 +-
 bin/email2irc.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/email2irc.py b/bin/email2irc.py
index 6cadd07..7a5712c 100755
--- a/bin/email2irc.py
+++ b/bin/email2irc.py
@@ -99,7 +99,7 @@ ircmsg = re.sub(r' See ', r' ', ircmsg)
 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'/display/redirect.*$', r'', ircmsg)
 ircmsg = re.sub(r'/$', r'', ircmsg)
 
 print('''
diff --git a/bin/email2irc.sh b/bin/email2irc.sh
index aaaf57f..3948d21 100755
--- a/bin/email2irc.sh
+++ b/bin/email2irc.sh
@@ -135,7 +135,8 @@ if [ "$VALID_MAIL" = "true" ] ; then
 		MESSAGE="$(echo $MESSAGE | sed -s 's#\?page=changes$##') "
 		MESSAGE="$(echo $MESSAGE | sed -s 's#/console$##') "
 		MESSAGE="$(echo $MESSAGE | sed -s 's#/changes$##') "
-		MESSAGE="$(echo $MESSAGE | sed -s 's#display/redirec.*\>$##') "
+		MESSAGE="$(echo $MESSAGE | sed -s 's#/display/redirect.*$##') "
+		MESSAGE="$(echo $MESSAGE | sed -s 's#/$##') "
 		# log message
 		echo "Notified #$CHANNEL with $MESSAGE" >> $LOGFILE
 		# notify kgb

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git