ID isn't needed

3 files changed, 9 insertions, 16 deletions

diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index 0dab6c5..a450469 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -794,7 +794,6 @@ namespace paludis
     template <>
     struct Imp<EContentsKey>
     {
-        const std::shared_ptr<const ERepositoryID> id;
         const FSPath filename;
         mutable Mutex value_mutex;
         mutable std::shared_ptr<Contents> value;
@@ -803,9 +802,7 @@ namespace paludis
         const std::string human_name;
         const MetadataKeyType type;
 
-        Imp(const std::shared_ptr<const ERepositoryID> & i, const FSPath & v,
-                const std::string & r, const std::string & h, const MetadataKeyType & t) :
-            id(i),
+        Imp(const FSPath & v, const std::string & r, const std::string & h, const MetadataKeyType & t) :
             filename(v),
             raw_name(r),
             human_name(h),
@@ -815,9 +812,8 @@ namespace paludis
     };
 }
 
-EContentsKey::EContentsKey(const std::shared_ptr<const ERepositoryID> & id,
-        const std::string & r, const std::string & h, const FSPath & v, const MetadataKeyType t) :
-    Pimp<EContentsKey>(id, v, r, h, t)
+EContentsKey::EContentsKey(const std::string & r, const std::string & h, const FSPath & v, const MetadataKeyType t) :
+    Pimp<EContentsKey>(v, r, h, t)
 {
 }
 
@@ -833,15 +829,15 @@ EContentsKey::value() const
     if (_imp->value)
         return _imp->value;
 
-    Context context("When creating contents for VDB key '" + stringify(*_imp->id) + "' from '" + stringify(_imp->filename) + "':");
+    Context context("When creating contents from '" + stringify(_imp->filename) + "':");
 
     _imp->value = std::make_shared<Contents>();
 
     FSPath f(_imp->filename);
     if (! f.stat().is_regular_file_or_symlink_to_regular_file())
     {
-        Log::get_instance()->message("e.contents.not_a_file", ll_warning, lc_context) << "CONTENTS lookup failed for request for '" <<
-                *_imp->id << "' using '" << _imp->filename << "'";
+        Log::get_instance()->message("e.contents.not_a_file", ll_warning, lc_context) << "Could not read CONTENTS file '" <<
+            _imp->filename << "'";
         return _imp->value;
     }
 
diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh
index 989da78..ff9270b 100644
--- a/paludis/repositories/e/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
@@ -252,9 +252,7 @@ namespace paludis
             private Pimp<EContentsKey>
         {
             public:
-                EContentsKey(
-                        const std::shared_ptr<const ERepositoryID> &,
-                        const std::string &, const std::string &, const FSPath &, const MetadataKeyType);
+                EContentsKey(const std::string &, const std::string &, const FSPath &, const MetadataKeyType);
                 ~EContentsKey();
 
                 const std::shared_ptr<const Contents> value() const
diff --git a/paludis/repositories/e/vdb_id.cc b/paludis/repositories/e/vdb_id.cc
index d708e37..9be7542 100644
--- a/paludis/repositories/e/vdb_id.cc
+++ b/paludis/repositories/e/vdb_id.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2007, 2008, 2010 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2010, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -53,7 +53,6 @@ VDBID::contents_filename() const
 std::shared_ptr<MetadataValueKey<std::shared_ptr<const Contents> > >
 VDBID::make_contents_key() const
 {
-    return std::make_shared<EContentsKey>(shared_from_this(), "CONTENTS", "Contents",
-                fs_location_key()->value() / "CONTENTS", mkt_internal);
+    return std::make_shared<EContentsKey>("CONTENTS", "Contents", fs_location_key()->value() / "CONTENTS", mkt_internal);
 }