From a63b31e2469ecf5977260355dc3a6c826facbf68 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 21 Feb 2018 10:40:41 +0200 Subject: Make dist diagnostics less noisy at verbosity level 1 --- build2/dist/operation.cxx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx index c8cc60d..96af34a 100644 --- a/build2/dist/operation.cxx +++ b/build2/dist/operation.cxx @@ -309,9 +309,17 @@ namespace build2 // Clean up the target directory. // - if (build2::rmdir_r (td) == rmdir_status::not_empty) + if (build2::rmdir_r (td, true, 2) == rmdir_status::not_empty) fail << "unable to clean target directory " << td; + // We used to print 'dist ' at verbosity level 1 but that has + // proven to be just noise. Though we still want to print something + // since otherwise, once the progress line is cleared, we may end up + // with nothing printed at all. + // + if (verb == 1) + text << "dist " << dist_package; + install (dist_cmd, td); // Copy over all the files. Apply post-processing callbacks. @@ -449,8 +457,6 @@ namespace build2 if (verb >= 2) print_process (args); - else if (verb) - text << "dist -d " << d; run (cmd, args); } @@ -488,8 +494,6 @@ namespace build2 if (verb >= 2) print_process (args); - else if (verb) - text << "dist " << t; run (cmd, args); -- cgit v1.1