aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/e_key.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-07 09:43:17 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-07 11:32:57 +0000
commit4d63e4274e65f15770a290c6cde919dc6b95a73c (patch)
tree05176668b8f305c02649183afb07fcb2a4f1e319 /paludis/repositories/e/e_key.cc
parent12ffed7c10d7c51d8fe3abf2a36173e279d9c796 (diff)
downloadpaludis-4d63e4274e65f15770a290c6cde919dc6b95a73c.tar.gz
paludis-4d63e4274e65f15770a290c6cde919dc6b95a73c.tar.xz
ID isn't needed
Diffstat (limited to 'paludis/repositories/e/e_key.cc')
-rw-r--r--paludis/repositories/e/e_key.cc18
1 files changed, 10 insertions, 8 deletions
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index fdf073509..ece53a8c7 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -480,21 +480,22 @@ namespace paludis
struct Imp<EPlainTextSpecKey>
{
const Environment * const env;
- const std::shared_ptr<const ERepositoryID> id;
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;
const MetadataKeyType type;
- Imp(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ Imp(const Environment * const e, const std::string & v,
const std::shared_ptr<const EAPIMetadataVariable> & m,
+ const std::shared_ptr<const EAPI> & p,
const MetadataKeyType t) :
env(e),
- id(i),
string_value(v),
variable(m),
+ eapi(p),
type(t)
{
}
@@ -502,9 +503,10 @@ namespace paludis
}
EPlainTextSpecKey::EPlainTextSpecKey(const Environment * const e,
- const std::shared_ptr<const ERepositoryID> & id,
- const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
- Pimp<EPlainTextSpecKey>(e, id, v, m, t)
+ const std::shared_ptr<const EAPIMetadataVariable> & m,
+ const std::shared_ptr<const EAPI> & p,
+ const std::string & v, const MetadataKeyType t) :
+ Pimp<EPlainTextSpecKey>(e, v, m, p, t)
{
}
@@ -520,8 +522,8 @@ EPlainTextSpecKey::value() const
if (_imp->value)
return _imp->value;
- Context context("When parsing metadata key '" + raw_name() + "' from '" + stringify(*_imp->id) + "':");
- _imp->value = parse_plain_text(_imp->string_value, _imp->env, *_imp->id->eapi());
+ Context context("When parsing metadata key '" + raw_name() + "':");
+ _imp->value = parse_plain_text(_imp->string_value, _imp->env, *_imp->eapi);
return _imp->value;
}