summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-30 18:43:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-30 18:43:13 +0000
commit7452e896e7f1a46075824e4daa5ecc4e29960037 (patch)
treeb1345994d860d21b287522bd5bf8901afd651476
parentddf68d39f1c659069c7efd979dc39956b96e08bf (diff)
downloaddrakx-7452e896e7f1a46075824e4daa5ecc4e29960037.tar
drakx-7452e896e7f1a46075824e4daa5ecc4e29960037.tar.gz
drakx-7452e896e7f1a46075824e4daa5ecc4e29960037.tar.bz2
drakx-7452e896e7f1a46075824e4daa5ecc4e29960037.tar.xz
drakx-7452e896e7f1a46075824e4daa5ecc4e29960037.zip
perl_checker compliance
-rw-r--r--perl-install/standalone.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index c8a81ca89..80cc19c10 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -197,7 +197,7 @@ sub ensure_is_installed {
}
sub check_kernel_module_packages {
- my ($do, $base_name, $ext_name) = @_;
+ my ($do, $base_name, $o_ext_name) = @_;
my ($result, %list, %select);
my @rpm_qa if 0;
@@ -213,16 +213,16 @@ sub check_kernel_module_packages {
$urpm->parse_synthesis("$urpm->{statedir}/synthesis.$_->{hdlist}");
}
foreach (@{$urpm->{depslist} || []}) {
- $_->name eq $ext_name and $list{$_->name} = 1;
+ $_->name eq $o_ext_name and $list{$_->name} = 1;
$_->name =~ /$base_name/ and $list{$_->name} = 1;
}
foreach (@rpm_qa) {
my ($name) = /(.*?)-[^-]*-[^-]*$/ or next;
- $name eq $ext_name and $list{$name} = 0;
+ $name eq $o_ext_name and $list{$name} = 0;
$name =~ /$base_name/ and $list{$name} = 0;
}
};
- if (!$ext_name || exists $list{$ext_name}) {
+ if (!$o_ext_name || exists $list{$o_ext_name}) {
eval {
my ($version_release, $ext);
if (c::kernel_version() =~ /([^-]*)-([^-]*mdk)(\S*)/) {
@@ -237,7 +237,7 @@ sub check_kernel_module_packages {
($ext, $version_release) = /kernel[^\-]*(-smp|-enterprise|-secure)?(?:-([^\-]+))$/;
$list{"$base_name$ext-$version_release"} and $select{"$base_name$ext-$version_release"} = 1;
}
- $result = [ keys(%select), if_($ext_name, $ext_name) ];
+ $result = [ keys(%select), if_($o_ext_name, $o_ext_name) ];
}
}
return $result;