(run_treeview_dialog) really show all security, bugfix & normal

updates in "all updates" mode (#27268, backport)

1 files changed, 8 insertions, 3 deletions

diff --git a/rpmdrake b/rpmdrake
index 0fc86873..4e320610 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -76,6 +76,8 @@ if ($collation_locale) {
   $collation_locale =~ /UTF-8/ or setlocale(LC_COLLATE, "$collation_locale.UTF-8");
 }
 
+*urpm::msg::translate = \&common::translate;
+
 our %options;
 foreach (@ARGV) {
     /^-?-(\S+)$/ or next;
@@ -773,7 +775,10 @@ sub run_treeview_dialog {
             #mandrake_choices => sub { $pkgs =  },
             all_updates => sub {
                 my %pkgs = grep { my $p = $h->{installable}{$_}; $p->{pkg} && !$p->{selected} && $p->{pkg}->flag_installed && $p->{pkg}->flag_upgrade } keys %{$h->{installable}};
-                $pkgs = { map { $_ => $h->{installable}{$_} } keys %pkgs },
+                $pkgs = {
+                    (map { $_ => $pkgs->{$_} } keys %{$h->{updates}}),
+                    (map { $_ => $h->{installable}{$_} } keys %pkgs)
+                };
             },
             #security => sub { $pkgs =  },
             #normal => sub { $pkgs =  }
@@ -1923,7 +1928,7 @@ Is it ok to continue?", join("\n\n", $r, if_($to_install, $to_install)))) : $to_
         gurpm::label(N("Verifying package signatures..."));
         my $total = @rpms_install + @rpms_upgrade;
         my $progress;
-	my @invalid_sources = map { c::set_tagged_utf8($_); $_ } $urpm->check_sources_signatures(
+	my @invalid_sources = $urpm->check_sources_signatures(
 	    \%sources_install, \%sources,
 	    translate => 1, basename => 1,
 	    callback => sub {
@@ -1955,7 +1960,7 @@ Is it ok to continue?", join("\n\n", $r, if_($to_install, $to_install)))) : $to_
         my $something_installed;
         my $callback_inst = sub {
             my ($urpm, $type, $id, $subtype, $amount, $total) = @_;
-            my $pkg = defined $id && $urpm->{depslist}[$id];
+            my $pkg = defined $id ? $urpm->{depslist}[$id] : undef;
             if ($subtype eq 'start') {
                 if ($type eq 'trans') {
                     gurpm::label(@rpms_install ? N("Preparing packages installation...") : N("Preparing..."));