aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-08-06 22:39:19 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-08-06 22:39:19 +0100
commit34329461d843a53ba011a13b23a524624920d6ae (patch)
tree442011bb5c07a21900b4e9cdeea172d402676341
parent690f227d9efcbd1bf4e232591faf8b3885fc3b76 (diff)
downloadpaludis-34329461d843a53ba011a13b23a524624920d6ae.tar.gz
paludis-34329461d843a53ba011a13b23a524624920d6ae.tar.xz
Use new origin code instead
-rw-r--r--paludis/elike_choices-fwd.hh2
-rw-r--r--paludis/elike_choices.cc17
-rw-r--r--paludis/repositories/e/pipe_command_handler.cc2
3 files changed, 1 insertions, 20 deletions
diff --git a/paludis/elike_choices-fwd.hh b/paludis/elike_choices-fwd.hh
index 37ab43f..9e146a3 100644
--- a/paludis/elike_choices-fwd.hh
+++ b/paludis/elike_choices-fwd.hh
@@ -41,8 +41,6 @@ namespace paludis
const std::string canonical_build_options_human_name() PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
#include <paludis/elike_choices-se.hh>
-
- bool is_special_elike_choice_value(const std::shared_ptr<const ChoiceValue> &) PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
}
#endif
diff --git a/paludis/elike_choices.cc b/paludis/elike_choices.cc
index d659f27..23cab36 100644
--- a/paludis/elike_choices.cc
+++ b/paludis/elike_choices.cc
@@ -718,20 +718,3 @@ ELikeSymbolsChoiceValue::should_compress(const std::string & v)
throw InternalError(PALUDIS_HERE, "Unhandled ELikeSymbolsChoiceValueParameter");
}
-bool
-paludis::is_special_elike_choice_value(
- const std::shared_ptr<const ChoiceValue> & v)
-{
- static const std::set<std::string> specials({
- stringify(ELikeOptionalTestsChoiceValue::canonical_name_with_prefix()),
- stringify(ELikeRecommendedTestsChoiceValue::canonical_name_with_prefix()),
- stringify(ELikeExpensiveTestsChoiceValue::canonical_name_with_prefix()),
- stringify(ELikeJobsChoiceValue::canonical_name_with_prefix()),
- stringify(ELikeTraceChoiceValue::canonical_name_with_prefix()),
- stringify(ELikePreserveWorkChoiceValue::canonical_name_with_prefix()),
- stringify(ELikeSymbolsChoiceValue::canonical_name_with_prefix())
- });
-
- return specials.end() != specials.find(stringify(v->name_with_prefix()));
-}
-
diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc
index bde711e..85979b3 100644
--- a/paludis/repositories/e/pipe_command_handler.cc
+++ b/paludis/repositories/e/pipe_command_handler.cc
@@ -447,7 +447,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
return "EOPTIONQ ID " + stringify(*package_id) + " has no choice named '" + stringify(name) + "'";
}
- if (is_special_elike_choice_value(value))
+ if (co_explicit != value->origin())
return "Ecannot query option '" + stringify(name) + "' for ID " + stringify(*package_id);
if (value->enabled())