From 4c7b3f9500c668aa99328e419f6d09c722814f97 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 29 Mar 2018 14:02:18 +0200 Subject: Improve pkg-checkout progress diagnostics at verbosity level 1 --- bpkg/pkg-checkout.cxx | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'bpkg/pkg-checkout.cxx') diff --git a/bpkg/pkg-checkout.cxx b/bpkg/pkg-checkout.cxx index c53e545..faa1099 100644 --- a/bpkg/pkg-checkout.cxx +++ b/bpkg/pkg-checkout.cxx @@ -156,18 +156,27 @@ namespace bpkg // Distribute. // - // Note that on failure the package stays in the existing (working) state. + // Note that on failure the package stays in the existing (working) + // state. // // At first it may seem we have a problem: an existing package with the // same name will cause a conflict since we now have multiple package - // locations for the same package name. We are luck, however: subprojects - // are only loaded if used and since we don't support dependency cycles, - // the existing project should never be loaded by any of our dependencies. + // locations for the same package name. We are lucky, however: + // subprojects are only loaded if used and since we don't support + // dependency cycles, the existing project should never be loaded by any + // of our dependencies. // + + // At verbosity level 1 we want our (nicer) progress header but the + // build system's actual progress. + // + if (verb == 1) + text << "distributing " << n << '/' << v; + run_b (o, c, bspec, - false /* quiet */, + verb_b::progress, strings ({"config.dist.root=" + c.representation ()})); mc = sha256 (o, d / manifest_file); -- cgit v1.1