summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig/proprietary.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-10-04 16:58:50 +0000
committerOlivier Blin <oblin@mandriva.com>2007-10-04 16:58:50 +0000
commitfc640a6f1faf145c00d214fb57d411ccdd89450f (patch)
tree6b118d2774ea2646aeada31c7e473bb7149c6d11 /lib/Xconfig/proprietary.pm
parent2b9abc9d0de853de712490153ef2149d3d481742 (diff)
downloaddrakx-kbd-mouse-x11-fc640a6f1faf145c00d214fb57d411ccdd89450f.tar
drakx-kbd-mouse-x11-fc640a6f1faf145c00d214fb57d411ccdd89450f.tar.gz
drakx-kbd-mouse-x11-fc640a6f1faf145c00d214fb57d411ccdd89450f.tar.bz2
drakx-kbd-mouse-x11-fc640a6f1faf145c00d214fb57d411ccdd89450f.tar.xz
drakx-kbd-mouse-x11-fc640a6f1faf145c00d214fb57d411ccdd89450f.zip
when checking dkms module packages, check that modules are either available in urpmi media, or already installed (fix detection in live)
Diffstat (limited to 'lib/Xconfig/proprietary.pm')
-rw-r--r--lib/Xconfig/proprietary.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm
index 9205c5c..2c5e713 100644
--- a/lib/Xconfig/proprietary.pm
+++ b/lib/Xconfig/proprietary.pm
@@ -39,7 +39,8 @@ sub pkgs_for_Driver2 {
my ($pkg, $base_name) = ($Driver2 =~ /^fglrx/ || $Driver2 =~ /^nvidia/) ?
("x11-driver-video-$Driver2", $Driver2) : () or return;
- $do_pkgs->is_available($pkg) or log::l("proprietary package $pkg not available"), return;
+ $do_pkgs->is_installed($pkg) || $do_pkgs->is_available($pkg) or
+ log::l("proprietary package $pkg not available"), return;
my $module_pkgs = $do_pkgs->check_kernel_module_packages($base_name) or
log::l("$pkg available, but no kernel module package (for installed kernels, and no dkms)"), return;