diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 9 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,5 @@ +- revert commit dc9950451a6c83815e2f680f9eaba6da31a18300 + Version 6.10.1 - 26 June 2014, Thierry Vignaud - MageiaUpdate: diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 3c9f5d67..e9229b86 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -518,15 +518,16 @@ sub get_pkgs { $urpm->{rpmdrake_state} = $state; #- Don't forget it $gurpm->progress($level = 0.7); - my @installable_pkgs; + my %l; reset_pbar_count(1); foreach my $pkg (@{$urpm->{depslist}}) { update_pbar($gurpm); $pkg->flag_upgrade or next; - my $name = $pkg->fullname; - push @installable_pkgs, $name; - $all_pkgs{$name} = { pkg => $pkg }; + my $key = $pkg->name . $pkg->arch; + $l{$key} = $pkg if !$l{$key} || $l{$key}->compare($pkg); } + my @installable_pkgs = map { my $n = $_->fullname; $all_pkgs{$n} = { pkg => $_ }; $n } values %l; + undef %l; my @inactive_backports; my @active_backports; |