From f0eae9ee8e20c768cfbe6108eb3d3c869d28ac29 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 14 Mar 2008 14:29:30 +0000
Subject: only list priority upgrades if there're

---
 NEWS            | 1 +
 Rpmdrake/gui.pm | 2 +-
 Rpmdrake/pkg.pm | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 5ab59c5c..5b883186 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
   that we don't ask questions again
 - rpmdrake:
   o kill "Mandriva choices"
+  o only list priority upgrades if there're
 
 Version 4.6.1 - 10 March 2008, Thierry Vignaud
 
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 4a457654..4ab91ecc 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -496,7 +496,7 @@ sub pkgs_provider {
         all_updates => sub {
             @filtered_pkgs = @{$h->{updates}};
             # potential "updates" from media not tagged as updates:
-            if (!$options{pure_updates}) {
+            if (!$options{pure_updates} && !$Rpmdrake::pkg::need_restart) {
                 push @filtered_pkgs, grep { is_updatable($_) } @{$h->{installable}};
             }
         },
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 7d414470..f9620792 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -440,7 +440,7 @@ sub get_pkgs {
         }
     }
 
-    if ($probe_only_for_updates && $need_restart) {
+    if ($need_restart) {
         @requested_strict = map { scalar $_->fullname } @{$urpm->{depslist}}[keys %{$state->{selected}}];
         # drop non priority updates:
         undef @requested;
@@ -448,7 +448,7 @@ sub get_pkgs {
 
 
     # list updates including skiped ones + their deps in MandrivaUpdate:
-    @requested = uniq(@requested, @requested_strict) if $probe_only_for_updates;
+    @requested = uniq(@requested, @requested_strict);
 
     $priority_state = $need_restart ? $state : undef;
     $priority_requested = $need_restart ? $requested : undef;
-- 
cgit v1.2.1