aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-13 13:26:21 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 00:29:37 +0100
commit2a5a6088b7e0b5feeba0ef9b5f0690ae0113c673 (patch)
tree3881d10faafd4acb45ff83f7ce17c0b038693ab2
parent6bdf2a4d70cff6f4a4c917afb00907959449e941 (diff)
downloadpaludis-2a5a6088b7e0b5feeba0ef9b5f0690ae0113c673.tar.gz
paludis-2a5a6088b7e0b5feeba0ef9b5f0690ae0113c673.tar.xz
Don't cache required use
-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 a8a8b41..dd7a5a2 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -571,8 +571,6 @@ namespace paludis
{
const Environment * const env;
const std::string string_value;
- mutable Mutex value_mutex;
- mutable std::shared_ptr<const RequiredUseSpecTree> value;
const std::shared_ptr<const EAPIMetadataVariable> variable;
const std::shared_ptr<const EAPI> eapi;
@@ -613,13 +611,8 @@ ERequiredUseKey::~ERequiredUseKey()
const std::shared_ptr<const RequiredUseSpecTree>
ERequiredUseKey::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_required_use(_imp->string_value, _imp->env, *_imp->eapi, _imp->is_installed);
- return _imp->value;
+ return parse_required_use(_imp->string_value, _imp->env, *_imp->eapi, _imp->is_installed);
}
const std::string