From 520cfc51b9d5424012263df9322d94415c9741c4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 15 Feb 2012 19:31:42 +0000 Subject: (do_search) show 32bit packages last in searches on 64bit (mga#1261) --- rpmdrake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'rpmdrake') diff --git a/rpmdrake b/rpmdrake index 35864955..1166425c 100755 --- a/rpmdrake +++ b/rpmdrake @@ -195,14 +195,18 @@ sub do_search($$$$$$$) { my $iter; if (@search_results) { - $elems{$results_ok} = [ map { [ $_, $results_ok ] } sort { uc($a) cmp uc($b) } @search_results ]; + my $f = arch() =~ /x86_64/ ? sub { + my ($x64, $other) = partition { !/86$/ } @_; + (sort { uc($a) cmp uc($b) } @$x64), sort { uc($a) cmp uc($b) } @$other; + } : sub { sort { uc($a) cmp uc($b) } @_ }; + $elems{$results_ok} = [ map { [ $_, $results_ok ] } $f->(@search_results) ]; $iter = $options->{add_parent}->($results_ok); $options->{add_nodes}->(map { [ $_, $results_ok . ($options->{tree_mode} eq 'by_presence' ? '|' . ($pkgs->{$_}{pkg}->flag_installed ? N("Upgradable") : N("Addable")) : ($options->{tree_mode} eq 'by_selection' ? '|' . ($pkgs->{$_}{selected} ? N("Selected") : N("Not selected")) : '')) - ] } sort { uc($a) cmp uc($b) } @search_results); + ] } $f->(@search_results)); } else { $iter = $options->{add_parent}->($results_none); # clear package list: -- cgit v1.2.1