svn commit: r446986 - svnadmin/hooks/scripts

[Bryan Drewery]

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