aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-18 20:32:43 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-22 15:25:45 +0000
commit877928cc0d484a75923c94aed0f25079400939f4 (patch)
treed9274afda636969ea4143c947c2b7aebaa6740f8
parent58e9dcedb2b766cb52f8c29de5ea493f6346448a (diff)
downloadpaludis-877928cc0d484a75923c94aed0f25079400939f4.tar.gz
paludis-877928cc0d484a75923c94aed0f25079400939f4.tar.xz
Refactor slightly
-rw-r--r--paludis/resolver/decider.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 4838690..e1ab441 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -1349,13 +1349,14 @@ Decider::find_any_score(
return std::make_pair(acs_wrong_options_installed, operator_bias);
}
- const std::shared_ptr<DependencyReason> reason(std::make_shared<DependencyReason>(
- our_id, make_null_shared_ptr(), our_resolution->resolvent(), dep, _already_met(dep.spec(), our_id)));
- const std::shared_ptr<const Resolvents> resolvents(_get_resolvents_for(spec, reason).first);
-
- /* next: will already be installing */
+ /* various things only if we're not a block... */
if (! is_block)
{
+ const std::shared_ptr<DependencyReason> reason(std::make_shared<DependencyReason>(
+ our_id, make_null_shared_ptr(), our_resolution->resolvent(), dep, _already_met(dep.spec(), our_id)));
+ const std::shared_ptr<const Resolvents> resolvents(_get_resolvents_for(spec, reason).first);
+
+ /* next: will already be installing */
for (Resolvents::ConstIterator r(resolvents->begin()), r_end(resolvents->end()) ;
r != r_end ; ++r)
{
@@ -1376,11 +1377,7 @@ Decider::find_any_score(
if (any && ! any_bad)
return std::make_pair(acs_will_be_installing, operator_bias);
}
- }
- /* next: could install */
- if (! is_block)
- {
for (Resolvents::ConstIterator r(resolvents->begin()), r_end(resolvents->end()) ;
r != r_end ; ++r)
{