diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-17 13:12:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-17 13:12:24 +0000 |
| commit | a6bb06c83fc6ba09c6a31377be0fd4045f4f8dee (patch) | |
| tree | ab325d5fb641b376d13fb36bcab3ad308ddfc7e5 /perl-install/Xconfig/proprietary.pm | |
| parent | 540e247c8c4c4a48926b02c5021625088f7c904f (diff) | |
| download | drakx-a6bb06c83fc6ba09c6a31377be0fd4045f4f8dee.tar drakx-a6bb06c83fc6ba09c6a31377be0fd4045f4f8dee.tar.gz drakx-a6bb06c83fc6ba09c6a31377be0fd4045f4f8dee.tar.bz2 drakx-a6bb06c83fc6ba09c6a31377be0fd4045f4f8dee.tar.xz drakx-a6bb06c83fc6ba09c6a31377be0fd4045f4f8dee.zip | |
- fix module not returning true
- don't install_matrox_hal when testing
Diffstat (limited to 'perl-install/Xconfig/proprietary.pm')
| -rw-r--r-- | perl-install/Xconfig/proprietary.pm | 5 |
1 files changed, 4 insertions, 1 deletions
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; + |