svn commit: r389136 - svnadmin/hooks/scripts

[Xin LI]

Author: delphij
Date: Wed Jun 10 19:53:10 2015
New Revision: 389136
URL: https://svnweb.freebsd.org/changeset/ports/389136

Log:
  Filter out e.g. (blanket) when generating command for MFH.
  
  Approved by:	portmgr (bapt)

Modified:
  svnadmin/hooks/scripts/mfh.sh

Modified: svnadmin/hooks/scripts/mfh.sh
==============================================================================
--- svnadmin/hooks/scripts/mfh.sh	Wed Jun 10 19:53:02 2015	(r389135)
+++ svnadmin/hooks/scripts/mfh.sh	Wed Jun 10 19:53:10 2015	(r389136)
@@ -10,7 +10,9 @@ MFH_LINE=$(echo "$LOG" | grep '^MFH:[[:s
 if [ "$MFH_LINE" = "" ]; then
 	exit 0
 fi
-BRANCH=$(echo "$MFH_LINE" | sed -e "s|MFH:[[:blank:]]*\(.*\)|\1|")
+BRANCH_LINE=$(echo "$MFH_LINE" | sed -e "s|MFH:[[:blank:]]*\(.*\)|\1|")
+BRANCH=$(echo "${BRANCH_LINE}" | sed -Ee "s|([[:digit:]]+Q[[:digit:]]+)(.*)|\1|")
+BRANCH_DESC=${BRANCH_LINE##${BRANCH}}
 
 echo "
 Hello,
@@ -33,6 +35,6 @@ diff:
 ----------
 $DIFF
 ----------
-" | mail -s "MFH request r$REV to $BRANCH" portmgr at FreeBSD.org ports-secteam at FreeBSD.org
+" | mail -s "MFH request r$REV to $BRANCH${BRANCH_DESC}" portmgr at FreeBSD.org ports-secteam at FreeBSD.org