From a3b4a97b0ab90cdce8f0c93d740710bb2ea36c29 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 30 Apr 2007 13:10:52 +0000
Subject: don't install proprietary packages if drivers are already available
 (it helps not forcing to install the nvidia-kernel-2.6.xxx)

---
 lib/Xconfig/card.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/Xconfig/card.pm')

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
-- 
cgit v1.2.1