summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-10-04 16:40:31 +0000
committerOlivier Blin <oblin@mandriva.com>2007-10-04 16:40:31 +0000
commit5604997f13654d4ba9b361e7039f81dda73f30b3 (patch)
tree6e292a42f29edec789cc561c84f7c58f59df2225 /perl-install
parentcc134c0d627b3bcf3d60867aa4012a643b756679 (diff)
downloaddrakx-5604997f13654d4ba9b361e7039f81dda73f30b3.tar
drakx-5604997f13654d4ba9b361e7039f81dda73f30b3.tar.gz
drakx-5604997f13654d4ba9b361e7039f81dda73f30b3.tar.bz2
drakx-5604997f13654d4ba9b361e7039f81dda73f30b3.tar.xz
drakx-5604997f13654d4ba9b361e7039f81dda73f30b3.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 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/do_pkgs.pm6
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 84540e02d..29a2b024b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,6 @@
- fix installed modules detection (#34478)
+- when checking dkms module packages, check that modules are either
+ available in urpmi media, or already installed (fix detection in live)
Version 10.4.235 - 4 October 2007, by Thierry Vignaud
diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm
index 6bed053d8..a660954c7 100644
--- a/perl-install/do_pkgs.pm
+++ b/perl-install/do_pkgs.pm
@@ -91,11 +91,13 @@ sub check_kernel_module_packages {
my ($do, $base_name) = @_;
require bootloader;
- my @rpms = (
+ my @test_rpms = (
'dkms-' . $base_name,
map { $base_name . '-kernel-' . bootloader::vmlinuz2version($_) } bootloader::installed_vmlinuz()
);
- @rpms = $do->are_available(@rpms) or return;
+ @rpms = $do->are_available(@test_rpms);
+ @rpms = $do->are_installed(@test_rpms) if !@rpms;
+ @rpms or return;
log::l("those kernel module packages can be installed: " . join(' ', @rpms));