aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-07 22:14:51 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-07 22:14:51 +0000
commitd7d4c24743eb7ff29e357ebb8686e5b019dd23c9 (patch)
treedac321d94dc826e8712503422d0e7dd6092087fc
parent51e09af4120ba2fd4d9a1562510988564b480c69 (diff)
downloadpaludis-d7d4c24743eb7ff29e357ebb8686e5b019dd23c9.tar.gz
paludis-d7d4c24743eb7ff29e357ebb8686e5b019dd23c9.tar.xz
Prefer breaking to removing
-rw-r--r--paludis/resolver/decider.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 7797a63..6421858 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -159,15 +159,13 @@ Decider::_resolve_dependents()
{
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStepEvent());
- bool allowed_to_break(_allowed_to_break(*s)), should_remove(_remove_if_dependent(*s));
-
- if (allowed_to_break && ! should_remove)
+ if (_allowed_to_break(*s))
continue;
if (! _dependent(*s, changing.first, changing.second))
continue;
- if (should_remove)
+ if (_remove_if_dependent(*s))
{
Resolvent resolvent(*s, dt_install_to_slash);
@@ -179,7 +177,7 @@ Decider::_resolve_dependents()
_apply_resolution_constraint(resolvent, _resolution_for_resolvent(resolvent, true),
_make_constraint_for_removing_dependent(*s));
}
- else if (! allowed_to_break)
+ else
{
throw InternalError(PALUDIS_HERE, "unsafe " + stringify(**s));
}