aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-20 19:52:40 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-20 19:52:40 +0000
commit7cfd50b425c6e99f9d9623527890f1b546089983 (patch)
tree54cbdb43d3058f0f917220dbbc1461355481dccb /Rpmdrake
parentb6a2818a7b0a9f3335123a0008cd345382eccc2c (diff)
downloadrpmdrake-7cfd50b425c6e99f9d9623527890f1b546089983.tar
rpmdrake-7cfd50b425c6e99f9d9623527890f1b546089983.tar.gz
rpmdrake-7cfd50b425c6e99f9d9623527890f1b546089983.tar.bz2
rpmdrake-7cfd50b425c6e99f9d9623527890f1b546089983.tar.xz
rpmdrake-7cfd50b425c6e99f9d9623527890f1b546089983.zip
(get_string_from_keywords) faster test for backported package
Diffstat (limited to 'Rpmdrake')
-rw-r--r--Rpmdrake/gui.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 23991afc..ee5b96b1 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -161,7 +161,7 @@ sub get_string_from_keywords {
my $dangerous = N("It may <b>break</b> your system.");
my $s;
$s .= N("This package is not free software") . "\n" if member('non-free', @media_types);
- if (member('backport', @media_types)) {
+ if ($pkgs->{$name}{is_backport} || member('backport', @media_types)) {
return join("\n",
N("This package contains a new version that was backported."),
$unsupported, $dangerous, $s);
@@ -183,9 +183,9 @@ sub get_string_from_keywords {
}
sub get_main_text {
- my ($medium, $name, $summary, $is_update, $update_descr) = @_;
+ my ($medium, $fullname, $name, $summary, $is_update, $update_descr) = @_;
- my $txt = get_string_from_keywords($medium);
+ my $txt = get_string_from_keywords($medium, $fullname);
ugtk2::markup_to_TextView_format(
# force align "name - summary" to the right with RTL languages (#33603):
@@ -288,7 +288,7 @@ sub format_pkg_simplifiedinfo {
# discard update fields if not matching:
my $is_update = ($upkg->flag_upgrade && $update_descr && $update_descr->{pre});
my $summary = get_summary($key);
- my $s = get_main_text($raw_medium, $name, $summary, $is_update, $update_descr);
+ my $s = get_main_text($raw_medium, $key, $name, $summary, $is_update, $update_descr);
push @$s, get_advisory_link($update_descr) if $is_update;
push @$s, get_description($pkg, $update_descr);