From owner-svn-src-all@FreeBSD.ORG  Sat Sep 15 18:26:11 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 76868106564A;
	Sat, 15 Sep 2012 18:26:11 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 618718FC0A;
	Sat, 15 Sep 2012 18:26:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8FIQBPD005178;
	Sat, 15 Sep 2012 18:26:11 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8FIQBx4005175;
	Sat, 15 Sep 2012 18:26:11 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201209151826.q8FIQBx4005175@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 15 Sep 2012 18:26:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-svnadmin@freebsd.org
X-SVN-Group: svnadmin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240535 - svnadmin/hooks/scripts
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Sep 2012 18:26:11 -0000

Author: bz
Date: Sat Sep 15 18:26:09 2012
New Revision: 240535
URL: http://svn.freebsd.org/changeset/base/240535

Log:
  As an intermediate step to unify checkacl, check for a base (src) specific
  version as we do for doc and ports currently.
  
  Add an extra argument, which is currently ignored for base, stating that
  it is a request for a commit to base.

Modified:
  svnadmin/hooks/scripts/env.sh

Modified: svnadmin/hooks/scripts/env.sh
==============================================================================
--- svnadmin/hooks/scripts/env.sh	Sat Sep 15 18:00:34 2012	(r240534)
+++ svnadmin/hooks/scripts/env.sh	Sat Sep 15 18:26:09 2012	(r240535)
@@ -4,6 +4,8 @@ PATH=/s/svn/base/hooks/scripts:/usr/bin:
 export PATH
 cd /s/svn/base
 umask 002
-if [ -x /usr/local/bin/checkacl ]; then
-  eval `/usr/local/bin/checkacl`
+if [ -x /usr/local/bin/checkacl-base ]; then
+  eval `/usr/local/bin/checkacl-base base`
+elif [ -x /usr/local/bin/checkacl ]; then
+  eval `/usr/local/bin/checkacl base`
 fi