aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-12 20:42:55 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 00:29:37 +0100
commit578faea7b1b2749f70c29f5f7102a1ebf7ef147a (patch)
treeab2cea872845f605115a40b1ec0bd9d7ed3f4713
parentbfabefff08d7ed0ccd9acea96ae77db7d9811be0 (diff)
downloadpaludis-578faea7b1b2749f70c29f5f7102a1ebf7ef147a.tar.gz
paludis-578faea7b1b2749f70c29f5f7102a1ebf7ef147a.tar.xz
Don't cache parsed licences
-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 ecf8cba..5d5f9ee 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -160,8 +160,6 @@ namespace paludis
{
const Environment * const env;
const std::string string_value;
- mutable Mutex value_mutex;
- mutable std::shared_ptr<const LicenseSpecTree> value;
const std::shared_ptr<const EAPIMetadataVariable> variable;
const std::shared_ptr<const EAPI> eapi;
@@ -202,13 +200,8 @@ ELicenseKey::~ELicenseKey()
const std::shared_ptr<const LicenseSpecTree>
ELicenseKey::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_license(_imp->string_value, _imp->env, *_imp->eapi, _imp->is_installed);
- return _imp->value;
+ return parse_license(_imp->string_value, _imp->env, *_imp->eapi, _imp->is_installed);
}
const std::string