aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/eapi.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-09-05 13:06:25 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-09-05 13:06:25 +0100
commit7ff864517bbd6591139b27dfea8d0e1b43152f2c (patch)
tree0945d926c907a6668029056cd406427d19f7d657 /paludis/repositories/e/eapi.cc
parent85c9d08a87a6d5c9c78048e0495df1544c41f6bd (diff)
downloadpaludis-7ff864517bbd6591139b27dfea8d0e1b43152f2c.tar.gz
paludis-7ff864517bbd6591139b27dfea8d0e1b43152f2c.tar.xz
Use blocker annotations
Diffstat (limited to 'paludis/repositories/e/eapi.cc')
-rw-r--r--paludis/repositories/e/eapi.cc19
1 files changed, 12 insertions, 7 deletions
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index d73941657..40c5eb777 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -243,13 +243,18 @@ namespace
std::shared_ptr<const EAPIAnnotations> make_annotations(const KeyValueConfigFile & k)
{
return std::make_shared<EAPIAnnotations>(make_named_values<EAPIAnnotations>(
- n::myoptions_description() = k.get("annotations_myoptions_description"),
- n::myoptions_number_selected() = k.get("annotations_myoptions_number_selected"),
- n::myoptions_number_selected_at_least_one() = k.get("annotations_myoptions_number_selected_at_least_one"),
- n::myoptions_number_selected_at_most_one() = k.get("annotations_myoptions_number_selected_at_most_one"),
- n::myoptions_number_selected_exactly_one() = k.get("annotations_myoptions_number_selected_exactly_one"),
- n::myoptions_requires() = k.get("annotations_myoptions_requires")
- ));
+ n::blocker_resolution() = k.get("blocker_resolution"),
+ n::blocker_resolution_manual() = k.get("blocker_resolution_manual"),
+ n::blocker_resolution_uninstall_blocked_after() = k.get("blocker_resolution_uninstall_blocked_after"),
+ n::blocker_resolution_uninstall_blocked_before() = k.get("blocker_resolution_uninstall_blocked_before"),
+ n::blocker_resolution_upgrade_blocked_before() = k.get("blocker_resolution_upgrade_blocked_before"),
+ n::myoptions_description() = k.get("annotations_myoptions_description"),
+ n::myoptions_number_selected() = k.get("annotations_myoptions_number_selected"),
+ n::myoptions_number_selected_at_least_one() = k.get("annotations_myoptions_number_selected_at_least_one"),
+ n::myoptions_number_selected_at_most_one() = k.get("annotations_myoptions_number_selected_at_most_one"),
+ n::myoptions_number_selected_exactly_one() = k.get("annotations_myoptions_number_selected_exactly_one"),
+ n::myoptions_requires() = k.get("annotations_myoptions_requires")
+ ));
}
std::shared_ptr<const EAPIChoicesOptions> make_choices_options(const KeyValueConfigFile & k)