diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-09-16 23:07:07 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-09-16 23:07:07 +0000 |
| commit | c686cd1451bc950a899589dd143d247e5c3a3c0a (patch) | |
| tree | c6addd8396d1cd19009cc22b02fdf294de597fae | |
| parent | 2aa8cea513e0195e4587b1c2ac9b2d1500e576f7 (diff) | |
| download | drakx-c686cd1451bc950a899589dd143d247e5c3a3c0a.tar drakx-c686cd1451bc950a899589dd143d247e5c3a3c0a.tar.gz drakx-c686cd1451bc950a899589dd143d247e5c3a3c0a.tar.bz2 drakx-c686cd1451bc950a899589dd143d247e5c3a3c0a.tar.xz drakx-c686cd1451bc950a899589dd143d247e5c3a3c0a.zip | |
(read_rpmsrate): fix bug
| -rw-r--r-- | perl-install/pkgs.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index b938aa710..f4fc3d3b0 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -632,19 +632,19 @@ sub read_rpmsrate { map { if_($_ && packageName($_) =~ /locales-(.*)/, qq(LOCALES"$1")) } map { packageById($packages, $_) } packageDepsId($p); - @m = ((grep { !/^\d$/ } @m), @m2); + my @m3 = ((grep { !/^\d$/ } @m), @m2); if (packageRate($p)) { - next if @m == 1 && $m[0] eq 'INSTALL'; + next if @m3 == 1 && $m3[0] eq 'INSTALL'; - my ($rate2, @m3) = packageRateRFlags($p); - if (@m3 > 1 || @m > 1) { + my ($rate2, @m4) = packageRateRFlags($p); + if (@m3 > 1 || @m4 > 1) { log::l("can't handle complicate flags for packages appearing twice ($_)"); $fatal_error++; } log::l("package $_ appearing twice with different rates ($rate != $rate2)") if $rate != $rate2; - packageSetRateRFlags($p, $rate, "$m[0]||$m3[0]"); + packageSetRateRFlags($p, $rate, "$m3[0]||$m4[0]"); } else { - packageSetRateRFlags($p, $rate, @m); + packageSetRateRFlags($p, $rate, @m3); } } else { print "$_ = ", join(" && ", @m), "\n"; |