aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-11-22 16:33:54 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-11-22 16:33:54 +0000
commit38c9cbab07ab6ed6ed47eba2e1b20751051c45ad (patch)
tree78e15e20c6b8596ddcc86c432c23c07fe5e0f73d
parentaf555e396371785e041229734dec335a6a9ee83f (diff)
downloadpaludis-38c9cbab07ab6ed6ed47eba2e1b20751051c45ad.tar.gz
paludis-38c9cbab07ab6ed6ed47eba2e1b20751051c45ad.tar.xz
Show restarts even on failure
-rw-r--r--src/clients/cave/cmd_resolve.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
index 903150c..e01928e 100644
--- a/src/clients/cave/cmd_resolve.cc
+++ b/src/clients/cave/cmd_resolve.cc
@@ -1128,10 +1128,10 @@ ResolveCommand::run(
));
std::tr1::shared_ptr<Resolver> resolver(new Resolver(env.get(), resolver_functions));
bool is_set(false);
+ std::list<SuggestRestart> restarts;
+
try
{
- std::list<SuggestRestart> restarts;
-
{
DisplayCallback display_callback;
ScopedNotifierCallback display_callback_holder(env.get(),
@@ -1172,6 +1172,9 @@ ResolveCommand::run(
}
catch (...)
{
+ if (! restarts.empty())
+ display_restarts_if_requested(restarts, cmdline);
+
dump_if_requested(env, resolver, cmdline);
throw;
}