aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/unpackaged/unpackaged_id.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-08-05 17:56:23 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-08-05 17:56:23 +0100
commita8482df055d2233fabd142ec5bcf8ea748adc888 (patch)
tree9ad7dcda4e490d5ab93d264c4d9cee4abbf93fd0 /paludis/repositories/unpackaged/unpackaged_id.cc
parent426a01ee4256e2c8fc9135a43a156846a6d593cc (diff)
downloadpaludis-a8482df055d2233fabd142ec5bcf8ea748adc888.tar.gz
paludis-a8482df055d2233fabd142ec5bcf8ea748adc888.tar.xz
build_options: preserve_work is now work=preserve
Fixes: ticket:1252
Diffstat (limited to 'paludis/repositories/unpackaged/unpackaged_id.cc')
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 5c312b8f7..8bdd59c78 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -366,7 +366,7 @@ UnpackagedID::perform_action(Action & action) const
auto choices(choices_key()->parse_value());
auto symbols_choice(choices->find_by_name_with_prefix(ELikeSymbolsChoiceValue::canonical_name_with_prefix()));
- auto preserve_work_choice(choices->find_by_name_with_prefix(ELikePreserveWorkChoiceValue::canonical_name_with_prefix()));
+ auto work_choice(choices->find_by_name_with_prefix(ELikeWorkChoiceValue::canonical_name_with_prefix()));
std::string used_config_protect;
@@ -400,7 +400,7 @@ UnpackagedID::perform_action(Action & action) const
}
MergerOptions extra_merger_options;
- if (preserve_work_choice && preserve_work_choice->enabled())
+ if (work_choice && ELikeWorkChoiceValue::should_merge_nondestructively(work_choice->parameter()))
extra_merger_options += mo_nondestructive;
MergeParams merge_params(make_named_values<MergeParams>(