aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/accounts/accounts_repository.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-27 16:11:53 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-27 16:11:53 +0000
commit7224ee80cc55396c267b2517c01ffd9527e16700 (patch)
tree85085d72bfa42878c40291e388c6a8c8fed173c9 /paludis/repositories/accounts/accounts_repository.cc
parent2c4c9b36faef13dd4ba408c80ca16461daee14bd (diff)
downloadpaludis-7224ee80cc55396c267b2517c01ffd9527e16700.tar.gz
paludis-7224ee80cc55396c267b2517c01ffd9527e16700.tar.xz
Make merge checks its own phase
Fixes: ticket:1085
Diffstat (limited to 'paludis/repositories/accounts/accounts_repository.cc')
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index 1ca62acb4..a84d72a46 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -426,6 +426,9 @@ AccountsRepository::merge(const MergeParams & m)
if (! _imp->handler_if_installed)
throw ActionFailedError("Can't merge to here");
+ if (m.check())
+ return;
+
_imp->handler_if_installed->merge(m);
}