aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Victor Duarte Martins <jvictor@mandriva.com>2010-08-31 20:05:34 +0000
committerJoão Victor Duarte Martins <jvictor@mandriva.com>2010-08-31 20:05:34 +0000
commitca0ee498517df2afe2a6c86df361f207a5dc1b3e (patch)
tree354b2a3fc557070adc612014533c5fdb480bd6d9
parent84894e4b1c7ff4e4ab3b53d076fce71f15140344 (diff)
downloadrpmdrake-ca0ee498517df2afe2a6c86df361f207a5dc1b3e.tar
rpmdrake-ca0ee498517df2afe2a6c86df361f207a5dc1b3e.tar.gz
rpmdrake-ca0ee498517df2afe2a6c86df361f207a5dc1b3e.tar.bz2
rpmdrake-ca0ee498517df2afe2a6c86df361f207a5dc1b3e.tar.xz
rpmdrake-ca0ee498517df2afe2a6c86df361f207a5dc1b3e.zip
(get_string_from_keywords): cleaned erroneous messages about updates
(fix #60629)
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/gui.pm8
2 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 238af024..8ac881cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix wrong notice message for updates (#60629)
+
Version 5.26.3 - 16 July 2010, Thierry Vignaud
- fix crashing when looking at update details (#60153)
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index c18a7503..1cd246d2 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -172,11 +172,11 @@ sub get_string_from_keywords {
$unsupported, $dangerous, $s);
} elsif (member('updates', @media_types)) {
return join("\n",
- (member('official', @media_types) && member('official', @media_types) ?
+ (member('official', @media_types) ?
N("This is an offical update which is supported by Mandriva.")
- : N("This is an unoffical update which is <b>not supported</b>.")),
- N("This package contains a new version that was backported."),
- $unsupported, $s);
+ : (N("This is an unoffical update."), $unsupported))
+ ,
+ $s);
} else {
$s .= N("This is an official package supported by Mandriva") . "\n" if member('official', @media_types);
return $s;