Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Dec 2013 18:53:54 +0000 (UTC)
From:      Peter Wemm <peter@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org
Subject:   svn commit: r259077 - svnadmin/hooks/scripts
Message-ID:  <201312071853.rB7Irspf080765@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312071853.rB7Irspf080765>