From owner-svn-doc-svnadmin@FreeBSD.ORG Thu Sep 11 00:19:38 2014 Return-Path: Delivered-To: svn-doc-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B4DD825; Thu, 11 Sep 2014 00:19:38 +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 667A2F9D; Thu, 11 Sep 2014 00:19:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8B0JcNN061499; Thu, 11 Sep 2014 00:19:38 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8B0Jc38061498; Thu, 11 Sep 2014 00:19:38 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201409110019.s8B0Jc38061498@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 11 Sep 2014 00:19:38 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-svnadmin@freebsd.org Subject: svn commit: r45589 - svnadmin/hooks/scripts X-SVN-Group: doc-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-svnadmin@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for svnadmin of the doc trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2014 00:19:38 -0000 Author: bdrewery (src,ports committer) Date: Thu Sep 11 00:19:37 2014 New Revision: 45589 URL: http://svnweb.freebsd.org/changeset/doc/45589 Log: Fix bugzilla dfilter script to handle: 1. Multiple PR per line 2. Multiple PR 3. PR lines with extra stuff after them such as references and (notes) PR: 190866 [1] PR: 191064 [2] Reported by: many Submitted by: ak, bdrewery Approved by: doceng (gjb) Modified: svnadmin/hooks/scripts/notify_bz.sh Modified: svnadmin/hooks/scripts/notify_bz.sh ============================================================================== --- svnadmin/hooks/scripts/notify_bz.sh Wed Sep 10 22:34:23 2014 (r45588) +++ svnadmin/hooks/scripts/notify_bz.sh Thu Sep 11 00:19:37 2014 (r45589) @@ -14,28 +14,30 @@ if [ -z "$REV" -o -z "$REPO" -o ! -d "$R exit 1 fi -PR="$(svnlook info "$REPO" -r "$REV" | sed -nE -e 's/^[ ]*[pP][rR]:[ ]*[a-zA-Z]+\/([0-9]+)/\1/p' -e 's/^[ ]*[pP][rR]:[ ]*([0-9]+)/\1/p')" +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 "$PR" ]; then +if [ -z "$PRS" ]; then exit 0 fi WHO="$(svnlook author "$REPO" -r "$REV")" -( -echo "From: commit-hook@freebsd.org" -echo "To: notify-bz@freebsd.org" -echo "Subject: [Bug $PR]" -echo "" -echo "A commit references this bug:" -echo "" -echo "Author: $WHO" -echo "Date: $(date)" -echo "New revision: $REV" -echo "URL: http://svnweb.freebsd.org/changeset/doc/$REV" -echo "" -echo "Log:" -svnlook log "$REPO" -r "$REV" | sed -e 's/^/ /' -echo "" -echo "Changes:" -svnlook changed "$REPO" -r "$REV" | sed -E -e 's/^[A-Z]*[ ]+/ /' -) | sed -e 's/^[ ]*$//' | cat -s | /usr/sbin/sendmail -oi -f commit-hook@freebsd.org notify-bz@freebsd.org +for pr in $PRS; do + ( + echo "From: commit-hook@freebsd.org" + echo "To: notify-bz@freebsd.org" + echo "Subject: [Bug $pr]" + echo "" + echo "A commit references this bug:" + echo "" + echo "Author: $WHO" + echo "Date: $(date)" + echo "New revision: $REV" + echo "URL: http://svnweb.freebsd.org/changeset/ports/$REV" + echo "" + echo "Log:" + svnlook log "$REPO" -r "$REV" | sed -e 's/^/ /' + echo "" + echo "Changes:" + svnlook changed "$REPO" -r "$REV" | sed -E -e 's/^[A-Z]*[ ]+/ /' + ) | sed -e 's/^[ ]*$//' | cat -s | /usr/sbin/sendmail -oi -f commit-hook@freebsd.org notify-bz@freebsd.org +done From owner-svn-doc-svnadmin@FreeBSD.ORG Fri Sep 12 13:13:16 2014 Return-Path: Delivered-To: svn-doc-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87159611; Fri, 12 Sep 2014 13:13:16 +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 72337DF1; Fri, 12 Sep 2014 13:13:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CDDG6r035652; Fri, 12 Sep 2014 13:13:16 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CDDGVA035651; Fri, 12 Sep 2014 13:13:16 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201409121313.s8CDDGVA035651@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 12 Sep 2014 13:13:16 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-svnadmin@freebsd.org Subject: svn commit: r45600 - svnadmin/hooks/scripts X-SVN-Group: doc-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-svnadmin@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for svnadmin of the doc trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 13:13:16 -0000 Author: bdrewery (src,ports committer) Date: Fri Sep 12 13:13:15 2014 New Revision: 45600 URL: http://svnweb.freebsd.org/changeset/doc/45600 Log: Fix SVN URL link for bz. Reported by: ngie Pointyhat to: bdrewery Approved by: doceng (gjb, implicit) Modified: svnadmin/hooks/scripts/notify_bz.sh Modified: svnadmin/hooks/scripts/notify_bz.sh ============================================================================== --- svnadmin/hooks/scripts/notify_bz.sh Fri Sep 12 12:57:45 2014 (r45599) +++ svnadmin/hooks/scripts/notify_bz.sh Fri Sep 12 13:13:15 2014 (r45600) @@ -32,7 +32,7 @@ for pr in $PRS; do echo "Author: $WHO" echo "Date: $(date)" echo "New revision: $REV" - echo "URL: http://svnweb.freebsd.org/changeset/ports/$REV" + echo "URL: http://svnweb.freebsd.org/changeset/doc/$REV" echo "" echo "Log:" svnlook log "$REPO" -r "$REV" | sed -e 's/^/ /'