diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-10-04 16:58:50 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-10-04 16:58:50 +0000 |
| commit | fc640a6f1faf145c00d214fb57d411ccdd89450f (patch) | |
| tree | 6b118d2774ea2646aeada31c7e473bb7149c6d11 | |
| parent | 2b9abc9d0de853de712490153ef2149d3d481742 (diff) | |
| download | drakx-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)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | lib/Xconfig/proprietary.pm | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,6 @@ +- when checking dkms module packages, check that modules are either + available in urpmi media, or already installed (fix detection in live) + Version 0.36 - 4 October 2007, by Pascal "Pixel" Rigaux - better fix for typo in 0.32: don't wrongly default to "automatic" resolution 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; |