From owner-svn-ports-all@freebsd.org  Mon Jul 31 16:32:37 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B730DB3C36;
 Mon, 31 Jul 2017 16:32:37 +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 39ED583398;
 Mon, 31 Jul 2017 16:32:37 +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 v6VGWaep027890;
 Mon, 31 Jul 2017 16:32:36 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6VGWaF8027889;
 Mon, 31 Jul 2017 16:32:36 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201707311632.v6VGWaF8027889@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 31 Jul 2017 16:32:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r446986 - svnadmin/hooks/scripts
X-SVN-Group: ports-svnadmin
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: svnadmin/hooks/scripts
X-SVN-Commit-Revision: 446986
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.23
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: Mon, 31 Jul 2017 16:32:37 -0000

Author: bdrewery
Date: Mon Jul 31 16:32:36 2017
New Revision: 446986
URL: https://svnweb.freebsd.org/changeset/ports/446986

Log:
  Allow portmgr overrides for py3- under some (uncodified) conditions:
  
   - They must be named category/py3-foo
   - They must be a *slave* port to a category/py-foo
   - They must be supported on all python versions
  
  Approved by:	portmgr (implicit)

Modified:
  svnadmin/hooks/scripts/detect-filename.sh

Modified: svnadmin/hooks/scripts/detect-filename.sh
==============================================================================
--- svnadmin/hooks/scripts/detect-filename.sh	Mon Jul 31 16:28:54 2017	(r446985)
+++ svnadmin/hooks/scripts/detect-filename.sh	Mon Jul 31 16:32:36 2017	(r446986)
@@ -13,6 +13,9 @@ if [ -z "$REPO" -o -z "$TXN" ]; then
   exit 1
 fi
 
+# Approved by portmgr gets a free pass
+$SVNLOOK log -t "$TXN" "$REPO" | grep -q 'portmgr' && exit 0
+
 # 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
@@ -23,9 +26,6 @@ if $SVNLOOK changed -t "$TXN" "$REPO" | grep -q -E '^A
   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
 
 # We scan through the transaction diff, looking for files with colon in the name
 if $SVNLOOK changed -t "$TXN" "$REPO" | grep -q -E '^A.*[:@]'; then