aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-08-27 16:16:11 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-09-12 23:11:58 +0200
commitb8bbd4d92901dec029f564cb8744e04370e01330 (patch)
tree5b6b2e4d8a97c62f2bd40be33df973e8a332a322
parent47f12646b34ad10fca581e8946ade89f18765483 (diff)
downloadperl-URPM-b8bbd4d92901dec029f564cb8744e04370e01330.tar
perl-URPM-b8bbd4d92901dec029f564cb8744e04370e01330.tar.gz
perl-URPM-b8bbd4d92901dec029f564cb8744e04370e01330.tar.bz2
perl-URPM-b8bbd4d92901dec029f564cb8744e04370e01330.tar.xz
perl-URPM-b8bbd4d92901dec029f564cb8744e04370e01330.zip
rename "suggests" method as "recommends_nosense"
in order to reflect reality but keep a suggests alias for compatibility for the time being
-rw-r--r--NEWS1
-rw-r--r--URPM.pm4
-rw-r--r--URPM.xs1
-rw-r--r--URPM/Resolve.pm4
4 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 324d067..3ba84e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- make it compatible with rpm-4.12.0
- use new recommends tags instead of suggests ones
+- rename "suggests" method as "recommends_nosense"
Version 4.31 - 27 June 2014
diff --git a/URPM.pm b/URPM.pm
index adf7320..e8f6509 100644
--- a/URPM.pm
+++ b/URPM.pm
@@ -735,7 +735,7 @@ Just the obsoleted package name.
If a header is associated with the package, fill the package fields from
the header's tags (NEVRA,
-requires/suggests/obsoletes/conflicts/provides/summary)
+requires/recommends/obsoletes/conflicts/provides/summary)
then free the header
It's useful when traversing the rpm DB, if one wants to keep around a
@@ -771,7 +771,7 @@ Full requires tags
Just the required package name.
-=item $package->suggests()
+=item $package->recommends_nosense()
=item $package->rflags()
diff --git a/URPM.xs b/URPM.xs
index 0681859..175d657 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -1862,6 +1862,7 @@ Pkg_obsoletes_nosense(pkg)
conflicts_nosense = 1
provides_nosense = 2
requires_nosense = 3
+ recommends_nosense= 4
suggests = 4
PPCODE:
PUTBACK;
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 690d7c5..0a8e3ed 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -1114,12 +1114,12 @@ sub resolve_requested_suggests {
my @todo = @$selected;
while (@todo) {
my $pkg = shift @todo;
- my %suggests = map { $_ => 1 } $pkg->suggests or next;
+ my %suggests = map { $_ => 1 } $pkg->recommends_nosense or next;
#- do not install a package that has already been suggested
$db->traverse_tag_find('name', $pkg->name, sub {
my ($p) = @_;
- delete $suggests{$_} foreach $p->suggests;
+ delete $suggests{$_} foreach $p->recommends_nosense;
});
# workaround: if you do "urpmi virtual_pkg" and one virtual_pkg is already installed,