From a6bb06c83fc6ba09c6a31377be0fd4045f4f8dee Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sat, 17 Aug 2002 13:12:24 +0000 Subject: - fix module not returning true - don't install_matrox_hal when testing --- perl-install/Xconfig/proprietary.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/Xconfig/proprietary.pm b/perl-install/Xconfig/proprietary.pm index bd94aba13..bb04bd892 100644 --- a/perl-install/Xconfig/proprietary.pm +++ b/perl-install/Xconfig/proprietary.pm @@ -15,7 +15,7 @@ sub install_matrox_hal { my $dest_dir = "$prefix/usr/X11R6/lib/modules/drivers"; #- already installed - return if -e "$dest_dir/mga_hal_drv.o"; + return if -e "$dest_dir/mga_hal_drv.o" || $::testing; system("wget -O $tmpdir/$tar ftp://ftp.matrox.com/pub/mga/archive/linux/2002/$tar") if !-e "$tmpdir/$tar"; system("tar xzC $tmpdir -f $tmpdir/$tar"); @@ -30,3 +30,6 @@ sub install_matrox_hal { rm_rf("$tmpdir/$tar"); rm_rf("$tmpdir/$dir_in_tar"); } + +1; + -- cgit v1.2.1