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-02-01 16:54:49 +0000
commite4e8cbccc27da42d281ba9fa86029e324c179a61 (patch)
treefbc03938791143190c6c7add5602850e06b0f353
parent30f65880a5c6da74231c587b7832ca0c2d02a6f8 (diff)
downloadpaludis-e4e8cbccc27da42d281ba9fa86029e324c179a61.tar.gz
paludis-e4e8cbccc27da42d281ba9fa86029e324c179a61.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 8e8b7bd0a..919ec61c2 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