Update of /cvsroot/lxr/lxr/lib/LXR/Files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25163/lib/LXR/Files
Modified Files:
CVS.pm
Log Message:
remember gnu_diff setting
Index: CVS.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/CVS.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- CVS.pm 20 Jul 2004 18:17:39 -0000 1.28
+++ CVS.pm 20 Jul 2004 20:40:21 -0000 1.29
@@ -34,12 +34,14 @@
$self->{'rootpath'} = $rootpath;
$self->{'rootpath'} =~ s@/*$@/@;
- # the rcsdiff command (used in getdiff) uses parameters only supported by GNU diff
- $ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin';
- if ( `diff --version` =~ /GNU/ ) {
- $gnu_diff = 1;
- } else {
- $gnu_diff = 0;
+ unless (defined $gnu_diff) {
+ # the rcsdiff command (used in getdiff) uses parameters only supported by GNU diff
+ $ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin';
+ if ( `diff --version` =~ /GNU/ ) {
+ $gnu_diff = 1;
+ } else {
+ $gnu_diff = 0;
+ }
}
return $self;
|
