summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-09-05 16:20:27 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-09-07 05:20:18 +0200
commitedbaba2d5dfc7673d4b543d2000fa4a6dbffef10 (patch)
tree514eca804e28e201d6f9764ff39ca4f996803756
parentd7d4a6f538362365ead3ac4fa2fa4aa2cfc6773c (diff)
downloadurpmi-edbaba2d5dfc7673d4b543d2000fa4a6dbffef10.tar
urpmi-edbaba2d5dfc7673d4b543d2000fa4a6dbffef10.tar.gz
urpmi-edbaba2d5dfc7673d4b543d2000fa4a6dbffef10.tar.bz2
urpmi-edbaba2d5dfc7673d4b543d2000fa4a6dbffef10.tar.xz
urpmi-edbaba2d5dfc7673d4b543d2000fa4a6dbffef10.zip
use ->recommends_nosense() instead of suggests"()
this is the new method name (even if compatibility still works). needs a new URPM.
-rw-r--r--urpm/orphans.pm6
-rw-r--r--urpm/xml_info_pkg.pm2
2 files changed, 4 insertions, 4 deletions
diff --git a/urpm/orphans.pm b/urpm/orphans.pm
index 9db0c1ef..5999de61 100644
--- a/urpm/orphans.pm
+++ b/urpm/orphans.pm
@@ -255,7 +255,7 @@ sub _unrequested_orphans_after_remove_once {
$db->traverse_tag('name', [ $n ], sub {
my ($p) = @_;
$p->fullname eq $fn or return;
- push @requires, $p->requires, $p->suggests;
+ push @requires, $p->requires, $p->recommends_nosense;
});
}
@@ -420,7 +420,7 @@ sub _all_unrequested_orphans {
while (my $pkg = shift @$req) {
# do not do anything regarding kernels if we failed to detect the running one (ie: chroot)
_kernel_callback($pkg, $unreq_list) if $current_kernel;
- foreach my $prop ($pkg->requires, $pkg->suggests) {
+ foreach my $prop ($pkg->requires, $pkg->recommends_nosense) {
my $n = URPM::property2name($prop);
foreach my $p (@{$provides{$n} || []}) {
if ($p != $pkg && $l{$p->name} && $p->provides_overlap($prop)) {
@@ -577,7 +577,7 @@ sub installed_leaves {
}
foreach my $pkg (@$packages) {
- foreach my $prop ($pkg->requires, $pkg->suggests) {
+ foreach my $prop ($pkg->requires, $pkg->recommends_nosense) {
my $n = URPM::property2name($prop);
foreach my $p (@{$provides{$n} || []}) {
$p != $pkg && $p->provides_overlap($prop) and
diff --git a/urpm/xml_info_pkg.pm b/urpm/xml_info_pkg.pm
index cd6ca9e6..bacc8d1c 100644
--- a/urpm/xml_info_pkg.pm
+++ b/urpm/xml_info_pkg.pm
@@ -56,7 +56,7 @@ sub conflicts { $_[0]{pkg}->conflicts }
sub obsoletes { $_[0]{pkg}->obsoletes }
sub provides { $_[0]{pkg}->provides }
sub requires { $_[0]{pkg}->requires }
-sub suggests { $_[0]{pkg}->suggests }
+sub suggests { $_[0]{pkg}->recommends_nosense }
=item url($pkg)