diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-06-26 23:07:21 +0200 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-06-26 23:08:10 +0200 |
commit | dc9950451a6c83815e2f680f9eaba6da31a18300 (patch) | |
tree | db302db2ebc3184ee5d9fb5258229a4f37777f08 | |
parent | 591a5deb5992efb4829481803c0874724bea1859 (diff) | |
download | rpmdrake-dc9950451a6c83815e2f680f9eaba6da31a18300.tar rpmdrake-dc9950451a6c83815e2f680f9eaba6da31a18300.tar.gz rpmdrake-dc9950451a6c83815e2f680f9eaba6da31a18300.tar.bz2 rpmdrake-dc9950451a6c83815e2f680f9eaba6da31a18300.tar.xz rpmdrake-dc9950451a6c83815e2f680f9eaba6da31a18300.zip |
This reverts commit d600679cdaf402a0f97bbbd76e7fa04c06c5a37e.
Rationale: it wreaks havoc (mga#12766)
Conflicts:
Rpmdrake/pkg.pm
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | Rpmdrake/pkg.pm | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,5 @@ +- MageiaUpdate: + o revert commit d600679cdaf402a0f97bbbd76e7fa04c06c5a37e (mga#12766) - edit-urpm-sources: o fix down arrow button not working (mga#13572) diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index e9229b86..3c9f5d67 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -518,16 +518,15 @@ sub get_pkgs { $urpm->{rpmdrake_state} = $state; #- Don't forget it $gurpm->progress($level = 0.7); - my %l; + my @installable_pkgs; reset_pbar_count(1); foreach my $pkg (@{$urpm->{depslist}}) { update_pbar($gurpm); $pkg->flag_upgrade or next; - my $key = $pkg->name . $pkg->arch; - $l{$key} = $pkg if !$l{$key} || $l{$key}->compare($pkg); + my $name = $pkg->fullname; + push @installable_pkgs, $name; + $all_pkgs{$name} = { pkg => $pkg }; } - my @installable_pkgs = map { my $n = $_->fullname; $all_pkgs{$n} = { pkg => $_ }; $n } values %l; - undef %l; my @inactive_backports; my @active_backports; |