From owner-svn-src-svnadmin@FreeBSD.ORG Thu Mar 19 16:14:28 2015 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A31DB7C3; Thu, 19 Mar 2015 16:14:28 +0000 (UTC) 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 8F2398FB; Thu, 19 Mar 2015 16:14:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JGESD7028797; Thu, 19 Mar 2015 16:14:28 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JGESeT028796; Thu, 19 Mar 2015 16:14:28 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201503191614.t2JGESeT028796@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 19 Mar 2015 16:14:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r280265 - svnadmin/hooks/scripts X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2015 16:14:28 -0000 Author: bdrewery Date: Thu Mar 19 16:14:27 2015 New Revision: 280265 URL: https://svnweb.freebsd.org/changeset/base/280265 Log: Fix dfilter script to support PR lines with commas. PR: 190866 Modified: svnadmin/hooks/scripts/notify_bz.sh Modified: svnadmin/hooks/scripts/notify_bz.sh ============================================================================== --- svnadmin/hooks/scripts/notify_bz.sh Thu Mar 19 15:55:02 2015 (r280264) +++ svnadmin/hooks/scripts/notify_bz.sh Thu Mar 19 16:14:27 2015 (r280265) @@ -14,7 +14,7 @@ if [ -z "$REV" -o -z "$REPO" -o ! -d "$R exit 1 fi -PRS="$(svnlook info "$REPO" -r "$REV" | grep -e '^[[:space:]]*[pP][rR]:[[:space:]]*'|grep -Eo '([a-zA-Z]+\/)*[^[]([0-9]+)[^]]'|sed -Ee 's,[[:space:]],,g' -e 's,[a-zA-Z]+\/,,g')" +PRS="$(svnlook info "$REPO" -r "$REV" | grep -e '^[[:space:]]*[pP][rR]:[[:space:]]*'|grep -Eo '([a-zA-Z]+\/)*[^[]([0-9]+)[^],]'|sed -Ee 's,[[:space:]],,g' -e 's,[a-zA-Z]+\/,,g')" if [ -z "$PRS" ]; then exit 0