summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-09-07 03:27:11 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-09-07 05:20:18 +0200
commitede9789afc616a0eef512a879aafca31d75f297e (patch)
tree3796ba8d348bf3edb0bdcf556a7be041e15b016c
parentd044f73e552be6b10cc8778b832969584e087cc7 (diff)
downloadurpmi-ede9789afc616a0eef512a879aafca31d75f297e.tar
urpmi-ede9789afc616a0eef512a879aafca31d75f297e.tar.gz
urpmi-ede9789afc616a0eef512a879aafca31d75f297e.tar.bz2
urpmi-ede9789afc616a0eef512a879aafca31d75f297e.tar.xz
urpmi-ede9789afc616a0eef512a879aafca31d75f297e.zip
adapt to URPM-5.00
-rw-r--r--NEWS1
-rw-r--r--urpm/msg.pm2
-rw-r--r--urpm/orphans.pm2
3 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index eb760093..7ecb6fb9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- rpm-4.12 support:
+ o adapt to URPM-5.00
o rename 'no_suggests' parameter as 'no_recommends'
o rename '--allow-suggests' option as '--allow-recommends'
o rename '--no-suggests' option as '--no-recommends'
diff --git a/urpm/msg.pm b/urpm/msg.pm
index 94fc1c6e..82457408 100644
--- a/urpm/msg.pm
+++ b/urpm/msg.pm
@@ -166,7 +166,7 @@ sub _format_line_selected_packages {
my @l = map {
my @name_and_evr = $_->fullname;
- if ($state->{selected}{$_->id}{suggested}) {
+ if ($state->{selected}{$_->id}{recommended}) {
push @name_and_evr, N("(suggested)");
}
\@name_and_evr;
diff --git a/urpm/orphans.pm b/urpm/orphans.pm
index 8cdf1992..5279eb1f 100644
--- a/urpm/orphans.pm
+++ b/urpm/orphans.pm
@@ -152,7 +152,7 @@ sub _selected_unrequested {
my $name = $pkg->name;
$pkg->flag_requested || urpm::select::was_pkg_name_installed($rejected, $name) ? () :
($name => "(required by " . $from->fullname . ")");
- } elsif ($selected->{$_}{suggested}) {
+ } elsif ($selected->{$_}{recommended}) {
($urpm->{depslist}[$_]->name => "(suggested)");
} else {
();