aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-13 13:41:24 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 00:29:38 +0100
commit482e0c9d51e606817af7c25ad68c3ee7314ca95e (patch)
tree639f47cbe76f6605b926158b24945bca6ec3f558
parentb58cf4a0f37f9477cdd3426b50583c1ff90dd0bd (diff)
downloadpaludis-482e0c9d51e606817af7c25ad68c3ee7314ca95e.tar.gz
paludis-482e0c9d51e606817af7c25ad68c3ee7314ca95e.tar.xz
Don't cache myoptions
-rw-r--r--paludis/repositories/e/e_key.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index 21797fe..f28c46c 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -486,8 +486,6 @@ namespace paludis
{
const Environment * const env;
const std::string string_value;
- mutable Mutex value_mutex;
- mutable std::shared_ptr<const PlainTextSpecTree> value;
const std::shared_ptr<const EAPIMetadataVariable> variable;
const std::shared_ptr<const EAPI> eapi;
@@ -527,13 +525,8 @@ EMyOptionsKey::~EMyOptionsKey()
const std::shared_ptr<const PlainTextSpecTree>
EMyOptionsKey::parse_value() const
{
- Lock l(_imp->value_mutex);
- if (_imp->value)
- return _imp->value;
-
Context context("When parsing metadata key '" + raw_name() + "':");
- _imp->value = parse_myoptions(_imp->string_value, _imp->env, *_imp->eapi, _imp->is_installed);
- return _imp->value;
+ return parse_myoptions(_imp->string_value, _imp->env, *_imp->eapi, _imp->is_installed);
}
const std::string