From owner-svn-ports-all@freebsd.org Sat Jun 17 22:14:24 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25A57C0A796; Sat, 17 Jun 2017 22:14:24 +0000 (UTC) (envelope-from bdrewery@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 mx1.freebsd.org (Postfix) with ESMTPS id DCFE5795A3; Sat, 17 Jun 2017 22:14:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5HMENWX086867; Sat, 17 Jun 2017 22:14:23 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5HMEN4P086866; Sat, 17 Jun 2017 22:14:23 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201706172214.v5HMEN4P086866@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 17 Jun 2017 22:14:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r443788 - 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.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jun 2017 22:14:24 -0000 Author: bdrewery Date: Sat Jun 17 22:14:22 2017 New Revision: 443788 URL: https://svnweb.freebsd.org/changeset/ports/443788 Log: Don't allow portmgr overrides for py3 slaves Modified: svnadmin/hooks/scripts/detect-filename.sh Modified: svnadmin/hooks/scripts/detect-filename.sh ============================================================================== --- svnadmin/hooks/scripts/detect-filename.sh Sat Jun 17 21:49:22 2017 (r443787) +++ svnadmin/hooks/scripts/detect-filename.sh Sat Jun 17 22:14:22 2017 (r443788) @@ -13,6 +13,17 @@ if [ -z "$REPO" -o -z "$TXN" ]; then exit 1 fi +# Look for new py3 ports +if $SVNLOOK changed -t "$TXN" "$REPO" | grep -q -E '^A.*/py3'; then + echo "Please do not add new py3 slave ports at this time. FLAVORS" >&2 + echo "support is coming soon which will remove the need for these kind of" >&2 + echo "slave ports. Having new ones come in slows down development for" >&2 + echo "FLAVORS support." >&2 + echo "It also confuses users if a new slave is added and then is" >&2 + echo "suddenly gone in a few weeks due to FLAVORS replacing it." >&2 + exit 1 +fi + # Approved by portmgr gets a free pass $SVNLOOK log -t "$TXN" "$REPO" | grep -q 'portmgr' && exit 0 @@ -24,17 +35,6 @@ if $SVNLOOK changed -t "$TXN" "$REPO" | grep -q -E '^A echo "For further information please read:" >&2 echo "http://www.freebsd.org/doc/en/books/porters-handbook/slow-patch.html" >&2 echo "Please fix this and try committing again." >&2 - exit 1 -fi - -# Look for new py3 ports -if $SVNLOOK changed -t "$TXN" "$REPO" | grep -q -E '^A.*/py3'; then - echo "Please do not add new py3 slave ports at this time. FLAVORS" >&2 - echo "support is coming soon which will remove the need for these kind of" >&2 - echo "slave ports. Having new ones come in slows down development for" >&2 - echo "FLAVORS support." >&2 - echo "It also confuses users if a new slave is added and then is" >&2 - echo "suddenly gone in a few weeks due to FLAVORS replacing it." >&2 exit 1 fi