svn commit: r349844 - svnadmin/hooks/scripts

[Baptiste Daroussin]

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
 	;;