aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-08-13 14:56:29 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-08-13 14:56:29 +0100
commitb08f9c745449f24346c3f286e5e23611e17ea85b (patch)
treebb50574eb7636d90826fd6601cc598c321bf4bd5
parent172b51622b6d3ec4607dd7e0efd4733fd3c374a4 (diff)
downloadpaludis-b08f9c745449f24346c3f286e5e23611e17ea85b.tar.gz
paludis-b08f9c745449f24346c3f286e5e23611e17ea85b.tar.xz
better notifier output
-rw-r--r--paludis/notifier_callback.cc11
-rw-r--r--paludis/notifier_callback.hh8
-rw-r--r--paludis/repositories/e/ebuild_id.cc3
3 files changed, 21 insertions, 1 deletions
diff --git a/paludis/notifier_callback.cc b/paludis/notifier_callback.cc
index 7425bbc..613fad6 100644
--- a/paludis/notifier_callback.cc
+++ b/paludis/notifier_callback.cc
@@ -24,6 +24,17 @@
using namespace paludis;
+NotifierCallbackGeneratingMetadataEvent::NotifierCallbackGeneratingMetadataEvent(const RepositoryName & r) :
+ _repo(r)
+{
+}
+
+const RepositoryName
+NotifierCallbackGeneratingMetadataEvent::repository() const
+{
+ return _repo;
+}
+
namespace paludis
{
template <>
diff --git a/paludis/notifier_callback.hh b/paludis/notifier_callback.hh
index 5709d84..e33ac11 100644
--- a/paludis/notifier_callback.hh
+++ b/paludis/notifier_callback.hh
@@ -24,6 +24,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/simple_visitor.hh>
#include <paludis/util/type_list.hh>
+#include <paludis/name.hh>
#include <paludis/environment-fwd.hh>
namespace paludis
@@ -39,6 +40,13 @@ namespace paludis
public NotifierCallbackEvent,
public ImplementAcceptMethods<NotifierCallbackEvent, NotifierCallbackGeneratingMetadataEvent>
{
+ private:
+ const RepositoryName _repo;
+
+ public:
+ NotifierCallbackGeneratingMetadataEvent(const RepositoryName & r);
+
+ const RepositoryName repository() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PALUDIS_VISIBLE NotifierCallbackResolverStepEvent :
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 12c6954..10470af 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -225,7 +225,8 @@ EbuildID::need_keys_added() const
Log::get_instance()->message("e.ebuild.cache.no_usable", ll_qa, lc_no_context)
<< "No usable cache entry for '" + canonical_form(idcf_full);
- _imp->environment->trigger_notifier_callback(NotifierCallbackGeneratingMetadataEvent());
+ _imp->environment->trigger_notifier_callback(NotifierCallbackGeneratingMetadataEvent(
+ _imp->repository->name()));
_imp->eapi = EAPIData::get_instance()->eapi_from_string(_imp->guessed_eapi);