From 78d21f22eb72a96d9e993e358743ed72349e4235 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 17 Dec 2017 10:50:57 +0200 Subject: Fix few issues with structured result output --- build2/b.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'build2/b.cxx') diff --git a/build2/b.cxx b/build2/b.cxx index 7bb9484..f6ee45a 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -1187,6 +1187,8 @@ main (int argc, char* argv[]) // Finally, match the rules and perform the operation. // + bool sr (); + if (pre_oid != 0) { l5 ([&]{trace << "start pre-operation batch " << pre_oif->name @@ -1203,7 +1205,7 @@ main (int argc, char* argv[]) result_printer p (tgs); if (mif->match != nullptr) - mif->match (mparams, a, tgs); + mif->match (mparams, a, tgs, true /* quiet */); if (mif->execute != nullptr && !ops.match_only ()) mif->execute (mparams, a, tgs, true /* quiet */); @@ -1226,7 +1228,7 @@ main (int argc, char* argv[]) result_printer p (tgs); if (mif->match != nullptr) - mif->match (mparams, a, tgs); + mif->match (mparams, a, tgs, ops.structured_result () /*quiet*/); if (mif->execute != nullptr && !ops.match_only ()) mif->execute (mparams, a, tgs, ops.structured_result () /*quiet*/); @@ -1250,7 +1252,7 @@ main (int argc, char* argv[]) result_printer p (tgs); if (mif->match != nullptr) - mif->match (mparams, a, tgs); + mif->match (mparams, a, tgs, true /* quiet */); if (mif->execute != nullptr && !ops.match_only ()) mif->execute (mparams, a, tgs, true /* quiet */); -- cgit v1.1