aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-09-12 20:39:38 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-09-12 21:33:54 +0100
commit71df668e7576418a296fc24f8063d99208df258b (patch)
tree9ad00668c5d54e0b81672196a144497a774f41df
parent852176d7e3e3ef7aeeef793d8a28a82b28e77025 (diff)
downloadpaludis-71df668e7576418a296fc24f8063d99208df258b.tar.gz
paludis-71df668e7576418a296fc24f8063d99208df258b.tar.xz
kill blank output
-rw-r--r--src/clients/cave/cmd_resolve.cc28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
index 5b6ed5d..d47b12e 100644
--- a/src/clients/cave/cmd_resolve.cc
+++ b/src/clients/cave/cmd_resolve.cc
@@ -669,25 +669,27 @@ ResolveCommand::run(
std::tr1::shared_ptr<Resolver> resolver(new Resolver(env.get(), resolver_functions));
try
{
- while (true)
{
DisplayCallback display_callback;
ScopedNotifierCallback display_callback_holder(env.get(),
NotifierCallbackFunction(std::tr1::cref(display_callback)));
- try
- {
- add_resolver_targets(env, resolver, cmdline);
- resolver->resolve();
- break;
- }
- catch (const SuggestRestart & e)
+ while (true)
{
- display_callback(ResolverRestart());
- initial_constraints.insert(std::make_pair(e.qpn_s(), make_initial_constraints_for(
- env.get(), cmdline, e.qpn_s()))).first->second->add(
- e.suggested_preset());
- resolver = make_shared_ptr(new Resolver(env.get(), resolver_functions));
+ try
+ {
+ add_resolver_targets(env, resolver, cmdline);
+ resolver->resolve();
+ break;
+ }
+ catch (const SuggestRestart & e)
+ {
+ display_callback(ResolverRestart());
+ initial_constraints.insert(std::make_pair(e.qpn_s(), make_initial_constraints_for(
+ env.get(), cmdline, e.qpn_s()))).first->second->add(
+ e.suggested_preset());
+ resolver = make_shared_ptr(new Resolver(env.get(), resolver_functions));
+ }
}
}