From owner-svn-ports-all@freebsd.org  Tue Feb 20 16:14:32 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7283F10A0F;
 Tue, 20 Feb 2018 16:14:32 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 86D467E23D;
 Tue, 20 Feb 2018 16:14:32 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 819643ECD;
 Tue, 20 Feb 2018 16:14:32 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1KGEWoY018357;
 Tue, 20 Feb 2018 16:14:32 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KGEWj2018356;
 Tue, 20 Feb 2018 16:14:32 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201802201614.w1KGEWj2018356@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 20 Feb 2018 16:14:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r462407 - svnadmin/hooks/scripts
X-SVN-Group: ports-svnadmin
X-SVN-Commit-Author: antoine
X-SVN-Commit-Paths: svnadmin/hooks/scripts
X-SVN-Commit-Revision: 462407
X-SVN-Commit-Repository: ports
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.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Feb 2018 16:14:33 -0000

Author: antoine
Date: Tue Feb 20 16:14:32 2018
New Revision: 462407
URL: https://svnweb.freebsd.org/changeset/ports/462407

Log:
  Allow commits to ports that already have FLAVORS
  
  With hat:	portmgr

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

Modified: svnadmin/hooks/scripts/stage-only.sh
==============================================================================
--- svnadmin/hooks/scripts/stage-only.sh	Tue Feb 20 16:06:28 2018	(r462406)
+++ svnadmin/hooks/scripts/stage-only.sh	Tue Feb 20 16:14:32 2018	(r462407)
@@ -34,11 +34,6 @@ for line in $(svnlook changed -t $TXN $REPO) ; do
 			echo "NOPORTDATA is nonsense as a variable affecting all ports." 1>&2
 			exit 1
 		fi
-		if svnlook cat -t ${TXN} ${REPO} $fpath | grep -q "^FLAVORS" ; then
-			echo "Do not commit a port with FLAVORS without first" 1>&2
-			echo "getting approval from portmgr." 1>&2
-			exit 1
-		fi
 	;;
 	head/*/*/pkg-plist*)
 		if svnlook cat -t ${TXN} ${REPO} $fpath | grep -q "%%PORTDATA%%" ; then
@@ -56,3 +51,8 @@ for line in $(svnlook changed -t $TXN $REPO) ; do
 	;;
 	esac
 done
+if svnlook diff -t ${TXN} ${REPO} | grep -q "^+FLAVORS" ; then
+	echo "Do not commit a port with FLAVORS without first" 1>&2
+	echo "getting approval from portmgr." 1>&2
+	exit 1
+fi