summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-14 07:00:39 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-14 07:00:39 +0000
commitc969aed64ef6d4fe8410416a4bbe677542f70c70 (patch)
tree8946b2113c441faf1eb9972c6493b29625973708 /perl-install
parentcccf0915c39d640156bf470acb7deceb0b4ea08e (diff)
downloaddrakx-c969aed64ef6d4fe8410416a4bbe677542f70c70.tar
drakx-c969aed64ef6d4fe8410416a4bbe677542f70c70.tar.gz
drakx-c969aed64ef6d4fe8410416a4bbe677542f70c70.tar.bz2
drakx-c969aed64ef6d4fe8410416a4bbe677542f70c70.tar.xz
drakx-c969aed64ef6d4fe8410416a4bbe677542f70c70.zip
(check_kernel_module_packages) make ext package optionnal
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/do_pkgs.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm
index 1f5996b4d..bc4cadc44 100644
--- a/perl-install/do_pkgs.pm
+++ b/perl-install/do_pkgs.pm
@@ -52,15 +52,17 @@ sub is_installed {
}
sub check_kernel_module_packages {
- my ($do, $base_name, $ext_name) = @_;
+ my ($do, $base_name, $o_ext_name) = @_;
require bootloader;
my @l = map { $base_name . '-' . bootloader::vmlinuz2version($_) } bootloader::installed_vmlinuz();
- my @rpms = $do->are_available($ext_name, @l);
+ my @ext = if_($o_ext_name, $o_ext_name);
+ my @rpms = $do->are_available(@ext, @l);
log::l("found kernel module packages $_") foreach @rpms;
- @rpms > 1 && \@rpms;
+ #- we want at least a kernel package and the ext package if specified
+ @rpms > @ext && \@rpms;
}
################################################################################