aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-29 20:15:25 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-29 20:15:25 +0000
commit6c231c4ca737ef368d5c0d42a19cb80737a682c0 (patch)
treee4f0460325073d13f082df65ca93a20b4748c9e5
parent47aba1e1a57867a0540e5c124ca9eaede7d5e7ee (diff)
downloadpaludis-6c231c4ca737ef368d5c0d42a19cb80737a682c0.tar.gz
paludis-6c231c4ca737ef368d5c0d42a19cb80737a682c0.tar.xz
Prioritise suggestions.conf more highly
-rw-r--r--paludis/resolver/interest_in_spec_helper.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/paludis/resolver/interest_in_spec_helper.cc b/paludis/resolver/interest_in_spec_helper.cc
index 8e8b7bd..919ec61 100644
--- a/paludis/resolver/interest_in_spec_helper.cc
+++ b/paludis/resolver/interest_in_spec_helper.cc
@@ -310,6 +310,15 @@ InterestInSpecHelper::operator() (
if ((! spec_group.empty()) && _imp->ignore_groups.end() != _imp->ignore_groups.find(spec_group))
return si_ignore;
+ if (dep.spec().if_package() && (suggestion || recommendation))
+ {
+ auto e(_imp->env->interest_in_suggestion(id, *dep.spec().if_package()));
+ if (e.is_true())
+ return si_take;
+ else if (e.is_false())
+ return si_ignore;
+ }
+
if (suggestion)
{
if (_imp->take_suggestions.is_true())
@@ -337,15 +346,6 @@ InterestInSpecHelper::operator() (
return si_take;
}
- if (dep.spec().if_package() && (suggestion || recommendation))
- {
- auto e(_imp->env->interest_in_suggestion(id, *dep.spec().if_package()));
- if (e.is_true())
- return si_take;
- else if (e.is_false())
- return si_ignore;
- }
-
return si_untaken;
}
else