From owner-svn-ports-svnadmin@FreeBSD.ORG  Wed Jun 10 19:53:11 2015
Return-Path: <owner-svn-ports-svnadmin@FreeBSD.ORG>
Delivered-To: svn-ports-svnadmin@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F302CB82;
 Wed, 10 Jun 2015 19:53:10 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E149E1E34;
 Wed, 10 Jun 2015 19:53:10 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5AJrAnU031533;
 Wed, 10 Jun 2015 19:53:10 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5AJrAsa031532;
 Wed, 10 Jun 2015 19:53:10 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201506101953.t5AJrAsa031532@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 10 Jun 2015 19:53:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r389136 - svnadmin/hooks/scripts
X-SVN-Group: ports-svnadmin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-svnadmin@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for svnadmin of the ports tree
 <svn-ports-svnadmin.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-svnadmin>, 
 <mailto:svn-ports-svnadmin-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-svnadmin/>
List-Post: <mailto:svn-ports-svnadmin@freebsd.org>
List-Help: <mailto:svn-ports-svnadmin-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-svnadmin>, 
 <mailto:svn-ports-svnadmin-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2015 19:53:11 -0000

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@FreeBSD.org ports-secteam@FreeBSD.org
+" | mail -s "MFH request r$REV to $BRANCH${BRANCH_DESC}" portmgr@FreeBSD.org ports-secteam@FreeBSD.org