aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-05-08 07:24:48 +0000
committerThierry Vignaud <tv@mandriva.org>2008-05-08 07:24:48 +0000
commit245ff0f622cd172e3d9c4cdf82dc9ea7008c929f (patch)
treebaf4fc5277b883f00dc3443c502c87bacbe58f4a
parent28158fb042056fb2d41f1b917176c92f5b3cafd2 (diff)
downloadrpmdrake-245ff0f622cd172e3d9c4cdf82dc9ea7008c929f.tar
rpmdrake-245ff0f622cd172e3d9c4cdf82dc9ea7008c929f.tar.gz
rpmdrake-245ff0f622cd172e3d9c4cdf82dc9ea7008c929f.tar.bz2
rpmdrake-245ff0f622cd172e3d9c4cdf82dc9ea7008c929f.tar.xz
rpmdrake-245ff0f622cd172e3d9c4cdf82dc9ea7008c929f.zip
(pkgs_provider) do not list backports as (unselected) updates in
rpmdrake, not just in MandrivaUpdate (#35009, #40556)
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/gui.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2fde6b71..2aed1647 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
- handle gracefully locked RPM DB when trying to install some packages
(#40244)
- rpmdrake:
+ o do not list backports as unselected updates media in rpmdrake, not
+ just in MandrivaUpdate (#35009, #40556)
o fix a crash when default view is unknown (#40025)
o fix searching when numeric pad's return key is pressed
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 706c16df..1efc2bad 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -531,7 +531,8 @@ sub pkgs_provider {
all_updates => sub {
# potential "updates" from media not tagged as updates:
if (!$options{pure_updates} && !$Rpmdrake::pkg::need_restart) {
- [ @{$h->{updates}}, grep { is_updatable($_) } @{$h->{installable}} ];
+ [ @{$h->{updates}},
+ difference2([ grep { is_updatable($_) } @{$h->{installable}} ], $h->{backports}) ];
} else {
$h->{updates};
}