From owner-svn-src-all@FreeBSD.ORG  Sat Dec  7 18:53:55 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2FEE9DB7;
 Sat,  7 Dec 2013 18:53:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1C79A1235;
 Sat,  7 Dec 2013 18:53:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7Irs5K080766;
 Sat, 7 Dec 2013 18:53:54 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7Irspf080765;
 Sat, 7 Dec 2013 18:53:54 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201312071853.rB7Irspf080765@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 7 Dec 2013 18:53:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-svnadmin@freebsd.org
Subject: svn commit: r259077 - svnadmin/hooks/scripts
X-SVN-Group: svnadmin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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, 07 Dec 2013 18:53:55 -0000

Author: peter
Date: Sat Dec  7 18:53:54 2013
New Revision: 259077
URL: http://svnweb.freebsd.org/changeset/base/259077

Log:
  We set $PATH explicitly for our commit scripts. Don't try to second guess it.

Modified:
  svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl

Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
==============================================================================
--- svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl	Sat Dec  7 18:48:27 2013	(r259076)
+++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl	Sat Dec  7 18:53:54 2013	(r259077)
@@ -40,28 +40,6 @@ use feature qw(switch);		# be 5.10 or la
 ######################################################################
 # Configuration section.
 
-# Svnlook path.
-my $svnlook = "/usr/local/bin/svnlook";
-
-# Since the path to svnlook depends upon the local installation
-# preferences, check that the required program exists to insure that
-# the administrator has set up the script properly.
-{
-  my $ok = 1;
-  foreach my $program ($svnlook) {
-    if (-e $program) {
-      unless (-x $program) {
-	warn "$0: required program `$program' is not executable, edit $0.\n";
-              $ok = 0;
-      }
-    } else {
-	warn "$0: required program `$program' does not exist, edit $0.\n";
-	$ok = 0;
-    }
-  }
-  exit 1 unless $ok;
-}
-
 ######################################################################
 # Initial setup/command-line handling.
 
@@ -101,7 +79,7 @@ chdir($tmp_dir)
 my $state = 0;
 my $path;
 my @errors;
-foreach my $line (&read_from_process($svnlook, 'diff', $repos, $mode, $txn)) {
+foreach my $line (&read_from_process('svnlook', 'diff', $repos, $mode, $txn)) {
   #printf "line: %s, current state %d\n", $line, $state;
   if ($state == 0 && $line =~ /^Property changes on: (.*)$/) {
     $path = $1;