aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-10 16:15:59 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-10 16:15:59 +0000
commitf9b9b3bb167ac3e33402e4af4820209a832f2555 (patch)
tree6bf87e032865647d18c228ed760311b9fd99b738
parent9d1ec0c161f207aa1267b8126c45b96576132f04 (diff)
downloadrpmdrake-f9b9b3bb167ac3e33402e4af4820209a832f2555.tar
rpmdrake-f9b9b3bb167ac3e33402e4af4820209a832f2555.tar.gz
rpmdrake-f9b9b3bb167ac3e33402e4af4820209a832f2555.tar.bz2
rpmdrake-f9b9b3bb167ac3e33402e4af4820209a832f2555.tar.xz
rpmdrake-f9b9b3bb167ac3e33402e4af4820209a832f2555.zip
(warn_about_media) really only update media in MandrivaUpdate, not in
rpmdrake (regression introduced in r238593 on 2008-03-05 for 4.4: "(readconf) remember latest view mode (#38138)")
-rw-r--r--NEWS5
-rw-r--r--Rpmdrake/pkg.pm2
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 42359ee8..48db69c3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+- rpmdrake:
+ o do not update media unlike MandrivaUpdate
+ (regression introduced in 4.4: "remember latest view mode
+ (#38138))")
+
Version 4.6 - 10 March 2008, Thierry Vignaud
- display in bold that priority updates require restarting
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 6e8bc8e0..c5e71afd 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -230,7 +230,7 @@ sub get_update_medias {
sub warn_about_media {
my ($w, $opts) = @_;
- return if !member($::default_list_mode, qw(all_updates security bugfix normal));
+ return if $::MODE ne 'update';
return if $::rpmdrake_options{'no-media-update'};
# we use our own instance of the urpmi db in order not to mess up with skip-list managment (#31092):