summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-04-22 21:59:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-04-22 21:59:30 +0000
commitdad25588ed26afe49277032b8b1b24b063e34efa (patch)
treeed2e1f85e3e34ab626550ef27e3a858fa57d308a /perl-install/install_any.pm
parente70327417f8ce3bd2a03c7da1fd46ea2a8e8e4b0 (diff)
downloaddrakx-dad25588ed26afe49277032b8b1b24b063e34efa.tar
drakx-dad25588ed26afe49277032b8b1b24b063e34efa.tar.gz
drakx-dad25588ed26afe49277032b8b1b24b063e34efa.tar.bz2
drakx-dad25588ed26afe49277032b8b1b24b063e34efa.tar.xz
drakx-dad25588ed26afe49277032b8b1b24b063e34efa.zip
perl_checker compliance for optional method arguments
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index f0ce7fcb9..a43dc80c8 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1142,11 +1142,11 @@ sub install {
}
sub ensure_is_installed {
- my ($do, $pkg, $file, $auto) = @_;
+ my ($do, $pkg, $file, $b_auto) = @_;
if (! -e "$::prefix$file") {
$do->{o}->ask_okcancel('', N("The package %s needs to be installed. Do you want to install it?", $pkg), 1)
- or return if !$auto;
+ or return if !$b_auto;
$do->{o}->do_pkgs->install($pkg);
}
if (! -e "$::prefix$file") {
@@ -1157,9 +1157,9 @@ sub ensure_is_installed {
}
sub check_kernel_module_packages {
- my ($do, $base_name, $ext_name) = @_;
+ my ($do, $base_name, $o_ext_name) = @_;
- if (!$ext_name || pkgs::packageByName($do->{o}{packages}, $ext_name)) {
+ if (!$o_ext_name || pkgs::packageByName($do->{o}{packages}, $o_ext_name)) {
my @rpms;
foreach my $p (@{$do->{o}{packages}{depslist}}) {
my ($ext, $version_release) = $p->name =~ /kernel[^\-]*(-smp|-enterprise|-secure)?(?:-([^\-]+))?$/
@@ -1170,7 +1170,7 @@ sub check_kernel_module_packages {
log::l("found kernel module packages $name");
push @rpms, $name;
}
- @rpms > 0 and return [ @rpms, if_($ext_name, $ext_name) ];
+ @rpms > 0 and return [ @rpms, if_($o_ext_name, $o_ext_name) ];
}
return undef;
}