From owner-svn-ports-all@freebsd.org  Sat Jun 17 03:36: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 9BA9AB956D1;
 Sat, 17 Jun 2017 03:36: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 6ACA87C9FE;
 Sat, 17 Jun 2017 03:36: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 v5H3aaZe023764;
 Sat, 17 Jun 2017 03:36:36 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5H3aaLW023763;
 Sat, 17 Jun 2017 03:36:36 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201706170336.v5H3aaLW023763@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: Sat, 17 Jun 2017 03:36:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r443729 - 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 <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: Sat, 17 Jun 2017 03:36:37 -0000

Author: bdrewery
Date: Sat Jun 17 03:36:36 2017
New Revision: 443729
URL: https://svnweb.freebsd.org/changeset/ports/443729

Log:
  Disallow adding ports with '@' in them.
  
  This will be used for FLAVORS.
  
  Approved by:	portmgr (implicit)

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

Modified: svnadmin/hooks/scripts/detect-filename.sh
==============================================================================
--- svnadmin/hooks/scripts/detect-filename.sh	Sat Jun 17 03:01:56 2017	(r443728)
+++ svnadmin/hooks/scripts/detect-filename.sh	Sat Jun 17 03:36:36 2017	(r443729)
@@ -17,9 +17,9 @@ fi
 $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
-  echo "Some files in your commit have a colon (:) in the name" >&2
-  echo "which is not allowed. Use _ instead of : for patches." >&2
+if $SVNLOOK changed -t "$TXN" "$REPO" | grep -q -E '^A.*[:@]'; then
+  echo "Some files in your commit have a colon (:) or (@) in the name" >&2
+  echo "which is not allowed. Use _ instead for patches." >&2
   echo "Or even better, generate your patches with make makepatch." >&2
   echo "For further information please read:" >&2
   echo "http://www.freebsd.org/doc/en/books/porters-handbook/slow-patch.html" >&2