summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-04-30 13:10:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-04-30 13:10:52 +0000
commita3b4a97b0ab90cdce8f0c93d740710bb2ea36c29 (patch)
tree063e7c076fd3239aa04ec0db23df7092ec1214d1 /lib
parent6b9873501a473508cadf32dc10105d71f9d8be7b (diff)
downloaddrakx-kbd-mouse-x11-a3b4a97b0ab90cdce8f0c93d740710bb2ea36c29.tar
drakx-kbd-mouse-x11-a3b4a97b0ab90cdce8f0c93d740710bb2ea36c29.tar.gz
drakx-kbd-mouse-x11-a3b4a97b0ab90cdce8f0c93d740710bb2ea36c29.tar.bz2
drakx-kbd-mouse-x11-a3b4a97b0ab90cdce8f0c93d740710bb2ea36c29.tar.xz
drakx-kbd-mouse-x11-a3b4a97b0ab90cdce8f0c93d740710bb2ea36c29.zip
don't install proprietary packages if drivers are already available
(it helps not forcing to install the nvidia-kernel-2.6.xxx)
Diffstat (limited to 'lib')
-rw-r--r--lib/Xconfig/card.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 2e40890..273fb98 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -307,7 +307,9 @@ sub install_server {
if ($card->{Driver2}) {
require Xconfig::proprietary;
- push @packages, Xconfig::proprietary::pkgs_for_Driver2($card, $do_pkgs);
+ if (!Xconfig::proprietary::may_use_Driver2($card)) {
+ push @packages, Xconfig::proprietary::pkgs_for_Driver2($card, $do_pkgs);
+ }
}
$do_pkgs->ensure_are_installed([ @must_have, @packages ], 1) or