summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-03-08 14:38:35 +0000
committerFrancois Pons <fpons@mandriva.com>2002-03-08 14:38:35 +0000
commit08cbb461f3683d3d4ac48e466b661854c90ebf20 (patch)
treed48b406c22044862529921fb773eff0ec7a78cef
parent42a2c73e67c7127ad44a6861d0fd22401d17291d (diff)
downloaddrakx-08cbb461f3683d3d4ac48e466b661854c90ebf20.tar
drakx-08cbb461f3683d3d4ac48e466b661854c90ebf20.tar.gz
drakx-08cbb461f3683d3d4ac48e466b661854c90ebf20.tar.bz2
drakx-08cbb461f3683d3d4ac48e466b661854c90ebf20.tar.xz
drakx-08cbb461f3683d3d4ac48e466b661854c90ebf20.zip
fixed possible additional XFree packages not installed if server is already
installed.
-rw-r--r--perl-install/Xconfigurator.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 40f475215..decb975e3 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -455,7 +455,11 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . "
}
unless ($::g_auto_install) {
- -x "$prefix$card->{prog}" or $do_pkgs->install($card->{use_xf4} ? 'XFree86-server' : "XFree86-$card->{server}", @l);
+ if (-x "$prefix$card->{prog}") {
+ @l and $do_pkgs->install(@l);
+ } else {
+ $do_pkgs->install($card->{use_xf4} ? 'XFree86-server' : "XFree86-$card->{server}", @l);
+ }
-x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})";
}