From owner-svn-ports-all@FreeBSD.ORG  Tue Apr  1 12:16:18 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A9548CC2;
 Tue,  1 Apr 2014 12:16:18 +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 93A62AA4;
 Tue,  1 Apr 2014 12:16:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31CGIXo061238;
 Tue, 1 Apr 2014 12:16:18 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31CGIR3061237;
 Tue, 1 Apr 2014 12:16:18 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201404011216.s31CGIR3061237@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 1 Apr 2014 12:16:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r349844 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2014 12:16:18 -0000

Author: bapt
Date: Tue Apr  1 12:16:17 2014
New Revision: 349844
URL: http://svnweb.freebsd.org/changeset/ports/349844
QAT: https://qat.redports.org/buildarchive/r349844/

Log:
  Prevent from committing stage ports without portmgr approval
  
  Reviewed by:	antoine, mat, bdrewery

Modified:
  svnadmin/hooks/scripts/stage-only.sh

Modified: svnadmin/hooks/scripts/stage-only.sh
==============================================================================
--- svnadmin/hooks/scripts/stage-only.sh	Tue Apr  1 12:02:40 2014	(r349843)
+++ svnadmin/hooks/scripts/stage-only.sh	Tue Apr  1 12:16:17 2014	(r349844)
@@ -6,19 +6,21 @@ TXN=$2
 
 OIFS=${IFS}
 IFS=$'\n'
-# svnlook log -r "${TXN}" "${REPO}" | grep -q portmgr && exit 0
+svnlook log -r "${TXN}" "${REPO}" | grep -q portmgr && exit 0
 for line in $(svnlook changed -t $TXN $REPO) ; do
 	IFS=${OIFS}
 	set -- $line
 	type=$1
 	fpath=$2
 	case $type in
-	[^A]*) continue;;
+	[^AU]*) continue;;
 	esac
 	case $fpath in
 	/head/*/*/Makefile*)
 		if svnlook cat -t ${TXN} ${REPO} $fpath | grep -q "^NO_STAGE" ; then
-			echo "Do not commit new ports with NO_STAGE" 1>&2
+			echo "Do not commit ports with NO_STAGE" 1>&2
+			echo "The port must be converted to support staging before it can be updated or added. See" 1>&2
+			echo "https://wiki.freebsd.org/ports/StageDir" 1>&2
 			exit 1
 		fi
 	;;