aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-05 15:45:09 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-05 15:46:25 +0000
commit4b06fa752f1b4ae8b21590d7c8ba92077f43dd68 (patch)
tree77edbcf5a35108b05067806e9d3e0e3ab6fde39a
parent20d31d0ba119fe8f5a888c3b8cd53ef4b8cdd7e3 (diff)
downloadpaludis-4b06fa752f1b4ae8b21590d7c8ba92077f43dd68.tar.gz
paludis-4b06fa752f1b4ae8b21590d7c8ba92077f43dd68.tar.xz
Only show pretend status if we have pretends
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index b7b0c2c..4390696 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -884,6 +884,9 @@ namespace
bool visit(const SimpleInstallJob & c) const
{
+ if (0 == counts.x_installs)
+ std::cout << "Executing pretend actions: " << std::flush;
+
std::tr1::shared_ptr<OutputManager> output_manager_goes_here;
return do_pretend(env, cmdline, *c.changes_to_make_decision(), ++counts.x_installs, counts.y_installs,
output_manager_goes_here);
@@ -933,14 +936,13 @@ namespace
).max_exit_status())
throw ActionAbortedError("Aborted by hook");
- std::cout << "Executing pretend actions: " << std::flush;
-
for (JobIDSequence::ConstIterator c(lists.taken_job_ids()->begin()),
c_end(lists.taken_job_ids()->end()) ;
c != c_end ; ++c)
failed = failed || ! lists.jobs()->fetch(*c)->accept_returning<bool>(DoOnePretendVisitor(env, cmdline, counts));
- cout << endl;
+ if (0 != counts.x_installs)
+ cout << endl;
if (0 != env->perform_hook(Hook("pretend_all_post")
("TARGETS", join(cmdline.begin_parameters(), cmdline.end_parameters(), " "))