aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-06 18:14:32 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-07 11:32:57 +0000
commitba48807953a1232e3ef23b06007ae9ec275e2285 (patch)
tree118aaec3cea682cd2acf4345465527686ffbff11
parent00dc02da2e66a9cc73202cc7e512aa212feba77c (diff)
downloadpaludis-ba48807953a1232e3ef23b06007ae9ec275e2285.tar.gz
paludis-ba48807953a1232e3ef23b06007ae9ec275e2285.tar.xz
ID isn't needed
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc2
-rw-r--r--paludis/repositories/e/e_key.cc12
-rw-r--r--paludis/repositories/e/e_key.hh3
3 files changed, 6 insertions, 11 deletions
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 9756dc7..a12eb0f 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -505,7 +505,7 @@ EInstalledRepositoryID::need_keys_added() const
_imp->keys->contents = make_contents_key();
add_metadata_key(_imp->keys->contents);
- _imp->keys->installed_time = std::make_shared<EMTimeKey>(shared_from_this(), "INSTALLED_TIME", "Installed time",
+ _imp->keys->installed_time = std::make_shared<EMTimeKey>("INSTALLED_TIME", "Installed time",
_imp->dir / contents_filename(), mkt_normal);
add_metadata_key(_imp->keys->installed_time);
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index b31ab2c..0dab6c5 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -914,7 +914,6 @@ namespace paludis
template <>
struct Imp<EMTimeKey>
{
- const std::shared_ptr<const ERepositoryID> id;
const FSPath filename;
mutable Mutex value_mutex;
mutable std::shared_ptr<Timestamp> value;
@@ -923,9 +922,8 @@ namespace paludis
const std::string human_name;
const MetadataKeyType type;
- Imp(const std::shared_ptr<const ERepositoryID> & i, const FSPath & v,
+ Imp(const FSPath & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
- id(i),
filename(v),
raw_name(r),
human_name(h),
@@ -935,9 +933,8 @@ namespace paludis
};
}
-EMTimeKey::EMTimeKey(const std::shared_ptr<const ERepositoryID> & id,
- const std::string & r, const std::string & h, const FSPath & v, const MetadataKeyType t) :
- Pimp<EMTimeKey>(id, v, r, h, t)
+EMTimeKey::EMTimeKey(const std::string & r, const std::string & h, const FSPath & v, const MetadataKeyType t) :
+ Pimp<EMTimeKey>(v, r, h, t)
{
}
@@ -962,8 +959,7 @@ EMTimeKey::value() const
catch (const FSError & e)
{
Log::get_instance()->message("e.contents.mtime_failure", ll_warning, lc_context) << "Couldn't get mtime for '"
- << _imp->filename << "' for ID '" << *_imp->id << "' due to exception '" << e.message()
- << "' (" << e.what() << ")";
+ << _imp->filename << "' due to exception '" << e.message() << "' (" << e.what() << ")";
}
return *_imp->value;
diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh
index 8b45c51..989da78 100644
--- a/paludis/repositories/e/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
@@ -270,8 +270,7 @@ namespace paludis
private Pimp<EMTimeKey>
{
public:
- EMTimeKey(const std::shared_ptr<const ERepositoryID> &,
- const std::string &, const std::string &, const FSPath &, const MetadataKeyType);
+ EMTimeKey(const std::string &, const std::string &, const FSPath &, const MetadataKeyType);
~EMTimeKey();
Timestamp value() const