aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/virtuals
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/virtuals')
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc3
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh3
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc9
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh3
4 files changed, 13 insertions, 5 deletions
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index 3c6441736..f676e6dfc 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -113,7 +113,6 @@ InstalledVirtualsRepository::InstalledVirtualsRepository(const Environment * con
value_for<n::destination_interface>(static_cast<RepositoryDestinationInterface *>(this)),
value_for<n::e_interface>(static_cast<RepositoryEInterface *>(0)),
value_for<n::environment_variable_interface>(static_cast<RepositoryEnvironmentVariableInterface *>(0)),
- value_for<n::hook_interface>(this),
value_for<n::make_virtuals_interface>(static_cast<RepositoryMakeVirtualsInterface *>(0)),
value_for<n::manifest_interface>(static_cast<RepositoryManifestInterface *>(0)),
value_for<n::mirrors_interface>(static_cast<RepositoryMirrorsInterface *>(0)),
@@ -237,7 +236,7 @@ InstalledVirtualsRepository::invalidate_masks()
}
HookResult
-InstalledVirtualsRepository::perform_hook(const Hook & hook) const
+InstalledVirtualsRepository::perform_hook(const Hook & hook)
{
Context context("When performing hook '" + stringify(hook.name()) + "' for repository '"
+ stringify(name()) + "':");
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index 5a726199f..d99bfc2b0 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -34,7 +34,6 @@ namespace paludis
*/
class PALUDIS_VISIBLE InstalledVirtualsRepository :
public Repository,
- public RepositoryHookInterface,
public RepositoryDestinationInterface,
public std::tr1::enable_shared_from_this<InstalledVirtualsRepository>,
private PrivateImplementationPattern<InstalledVirtualsRepository>
@@ -83,7 +82,7 @@ namespace paludis
virtual bool can_be_favourite_repository() const;
- HookResult perform_hook(const Hook &) const
+ HookResult perform_hook(const Hook &)
PALUDIS_ATTRIBUTE((warn_unused_result));
/* Repository */
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index 5dcbaa3df..d4dacd9f9 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -29,6 +29,7 @@
#include <paludis/generator.hh>
#include <paludis/filter.hh>
#include <paludis/filtered_generator.hh>
+#include <paludis/hook.hh>
#include <paludis/util/log.hh>
#include <paludis/util/make_shared_ptr.hh>
@@ -124,7 +125,6 @@ VirtualsRepository::VirtualsRepository(const Environment * const env) :
value_for<n::destination_interface>(static_cast<RepositoryDestinationInterface *>(0)),
value_for<n::e_interface>(static_cast<RepositoryEInterface *>(0)),
value_for<n::environment_variable_interface>(static_cast<RepositoryEnvironmentVariableInterface *>(0)),
- value_for<n::hook_interface>(static_cast<RepositoryHookInterface *>(0)),
value_for<n::make_virtuals_interface>(this),
value_for<n::manifest_interface>(static_cast<RepositoryManifestInterface *>(0)),
value_for<n::mirrors_interface>(static_cast<RepositoryMirrorsInterface *>(0)),
@@ -458,3 +458,10 @@ VirtualsRepository::populate_sets() const
{
}
+HookResult
+VirtualsRepository::perform_hook(const Hook &)
+{
+ return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
+}
+
+
diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh
index cf33555f5..a96ec4845 100644
--- a/paludis/repositories/virtuals/virtuals_repository.hh
+++ b/paludis/repositories/virtuals/virtuals_repository.hh
@@ -121,6 +121,9 @@ namespace paludis
virtual void populate_sets() const;
///\}
+
+ virtual HookResult perform_hook(const Hook & hook)
+ PALUDIS_ATTRIBUTE((warn_unused_result));
};
}