aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/accounts/accounts_repository.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-10 14:37:06 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-10 14:37:06 +0100
commitc84fb95a15d9b9b96a2e36509391fe6444cc69a0 (patch)
treec9a133c1628b9684a7ae469ef661a7574d56f0ce /paludis/repositories/accounts/accounts_repository.cc
parent0087be380e8f5cac800d07bf364b2974fccf17cf (diff)
downloadpaludis-c84fb95a15d9b9b96a2e36509391fe6444cc69a0.tar.gz
paludis-c84fb95a15d9b9b96a2e36509391fe6444cc69a0.tar.xz
Action exceptions work differently.
Aborts are no longer counted as 'failures'.
Diffstat (limited to 'paludis/repositories/accounts/accounts_repository.cc')
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index 77e76898b..b0e6a6ea5 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -414,7 +414,7 @@ void
AccountsRepository::merge(const MergeParams & m)
{
if (! _imp->handler_if_installed)
- throw InstallActionError("Can't merge to here");
+ throw ActionFailedError("Can't merge to here");
_imp->handler_if_installed->merge(m);
}