summaryrefslogtreecommitdiffstats
path: root/pm
diff options
context:
space:
mode:
Diffstat (limited to 'pm')
-rw-r--r--pm/MGATools/rpmsrate.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/pm/MGATools/rpmsrate.pm b/pm/MGATools/rpmsrate.pm
index 74e9e27..4e03ebe 100644
--- a/pm/MGATools/rpmsrate.pm
+++ b/pm/MGATools/rpmsrate.pm
@@ -79,7 +79,7 @@ sub lookup_pkg {
}
sub check_if_expandable {
- my ($key, $raw, $fullpath, $potloc, $locale, $localized_pkg, $urpm) = @_;
+ my ($raw, $fullpath, $potloc, $locale, $localized_pkg, $urpm) = @_;
my ($pg, $loc) = $raw =~ /^(.*)-([^-+]+)$/;
return if !$pg || !$loc;
return if !$potloc->{$pg};
@@ -88,7 +88,7 @@ sub check_if_expandable {
# still nothing? bailout:
if (!$pkg) {
- print "ERROR cleanrpmsrate: parse_rpm $fullpath ($key) failed\n";
+ print "ERROR cleanrpmsrate: parse_rpm $fullpath ($raw) failed\n";
next;
}
@@ -117,7 +117,6 @@ sub cleanrpmsrate {
foreach my $dir (keys %$reprpms) {
foreach (@{$reprpms->{$dir}}) {
my $rpm = "$_.rpm";
- my $key = $_;
s/-[^-]+-[^-]+\.[^.]+$// or next;
if (/(.*?)([_-]*[\d._]+)(-.*)?-devel$/ || /^$kernel_like(-[^.]+(?:\.[^.]+){3,6}\.?mga\d+)$/) {
@@ -135,7 +134,7 @@ sub cleanrpmsrate {
$rpms{$vname} = [ $3, $vname ];
}
} else {
- check_if_expandable($key, $_, "$dir/$rpm", $potloc, \%locale, \%localized_pkg, $urpm);
+ check_if_expandable($_, "$dir/$rpm", $potloc, \%locale, \%localized_pkg, $urpm);
}
}
}