aboutsummaryrefslogtreecommitdiff
path: root/paludis/resolver/orderer.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-09-03 10:21:57 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-09-05 10:32:34 +0100
commit0ad796a9ebe1a3706b3d97c100633fff3bc8b10c (patch)
tree9bf056b927e536fa2899b938e868d3fdf23676d2 /paludis/resolver/orderer.cc
parent4d0a770757e430cb2e972ea8aefd09d3294c2ce3 (diff)
downloadpaludis-0ad796a9ebe1a3706b3d97c100633fff3bc8b10c.tar.gz
paludis-0ad796a9ebe1a3706b3d97c100633fff3bc8b10c.tar.xz
Blocker strength is an enum, not a bool
Diffstat (limited to 'paludis/resolver/orderer.cc')
-rw-r--r--paludis/resolver/orderer.cc18
1 files changed, 16 insertions, 2 deletions
diff --git a/paludis/resolver/orderer.cc b/paludis/resolver/orderer.cc
index 5982901d1..ce753449e 100644
--- a/paludis/resolver/orderer.cc
+++ b/paludis/resolver/orderer.cc
@@ -260,8 +260,22 @@ namespace
{
bool normal(true);
if (r.sanitised_dependency().spec().if_block())
- if (! r.sanitised_dependency().spec().if_block()->strong())
- normal = false;
+ switch (r.sanitised_dependency().spec().if_block()->block_kind())
+ {
+ case bk_weak:
+ case bk_uninstall_blocked_after:
+ normal = false;
+ break;
+
+ case bk_strong:
+ case bk_manual:
+ case bk_upgrade_blocked_before:
+ case bk_uninstall_blocked_before:
+ break;
+
+ case last_bk:
+ break;
+ }
NAGIndex from(make_named_values<NAGIndex>(
n::resolvent() = r.from_resolvent(),