From 7e63a5f3cacb340438b0c668b82d1e9553abab95 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 15 Mar 2012 19:12:43 +0000
Subject: (check_if_expandable) one less argument

---
 pm/MGATools/rpmsrate.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'pm')

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);
 	    }
 	}
     }
-- 
cgit v1.2.1