From c07ca509169d05fc155c700a9f88672016304a2a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 12 Oct 2015 08:55:15 +0200 Subject: Make test script run quiet by default, add -v option for verbose --- bpkg/build.cxx | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'bpkg/build.cxx') diff --git a/bpkg/build.cxx b/bpkg/build.cxx index 10f668b..07d1cf0 100644 --- a/bpkg/build.cxx +++ b/bpkg/build.cxx @@ -469,7 +469,8 @@ namespace bpkg // Now collect this prerequisite. If it was actually collected // (i.e., it wasn't already there) and we are forcing an upgrade, - // then warn. Downgrade -- outright refuse. + // then warn, unless we are running quiet. Downgrade -- outright + // refuse. // if (collect (options, cd, db, move (dp)) && force) { @@ -477,17 +478,21 @@ namespace bpkg const version& av (rp.first->version); bool u (av > sv); - bool c (d.constraint); - diag_record dr; - (u ? dr << warn : dr << fail) - << "package " << name << " dependency on " - << (c ? "(" : "") << d << (c ? ")" : "") << " is forcing " - << (u ? "up" : "down") << "grade of " << d.name << " " << sv - << " to " << av; + if (verb || !u) + { + bool c (d.constraint); + diag_record dr; + + (u ? dr << warn : dr << fail) + << "package " << name << " dependency on " + << (c ? "(" : "") << d << (c ? ")" : "") << " is forcing " + << (u ? "up" : "down") << "grade of " << d.name << " " << sv + << " to " << av; - if (!u) - dr << info << "explicitly specify version downgrade to continue"; + if (!u) + dr << info << "explicitly specify version downgrade to continue"; + } } } -- cgit v1.1