From 0f51301fdb1b34c9485d34140b90ed42fc96f9c3 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 25 Jul 2019 17:51:16 +0300
Subject: Rollback verbosity level of build2 configure meta-operation run by
 worker from -V to -v

---
 bbot/worker/worker.cxx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'bbot/worker/worker.cxx')

diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index fc632ca..cf6751b 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -199,12 +199,13 @@ template <typename... A>
 static result_status
 run_bpkg (tracer& t,
           string& log, const regexes& warn_detect,
+          const char* verbosity,
           const string& cmd, A&&... a)
 {
   return run_cmd (t,
                   log, warn_detect,
                   "bpkg " + cmd,
-                  "bpkg", "-v", cmd, forward<A> (a)...);
+                  "bpkg", verbosity, cmd, forward<A> (a)...);
 }
 
 template <typename V, typename... A>
@@ -511,8 +512,8 @@ build (size_t argc, const char* argv[])
       //
       r.status |= run_bpkg (
         trace, r.log, wre,
+        "-V",
         "create",
-        "--build-option", "-V",
         "-d", build_dir.string (),
         "--wipe",
         step_args (modules,  step_id::bpkg_configure_create),
@@ -530,6 +531,7 @@ build (size_t argc, const char* argv[])
       //
       r.status |= run_bpkg (
         trace, r.log, wre,
+        "-v",
         "add",
         step_args (config_args, step_id::bpkg_configure_add),
         step_args (env_args,    step_id::bpkg_configure_add),
@@ -558,6 +560,7 @@ build (size_t argc, const char* argv[])
 
       r.status |= run_bpkg (
         trace, r.log, wre,
+        "-v",
         "fetch",
         step_args (config_args, step_id::bpkg_configure_fetch),
         step_args (env_args,    step_id::bpkg_configure_fetch),
@@ -574,8 +577,8 @@ build (size_t argc, const char* argv[])
       //
       r.status |= run_bpkg (
         trace, r.log, wre,
+        "-v",
         "build",
-        "--build-option", "-V",
         "--configure-only",
         "--yes",
         step_args (config_args, step_id::bpkg_configure_build),
@@ -600,6 +603,7 @@ build (size_t argc, const char* argv[])
       //
       r.status |= run_bpkg (
         trace, r.log, wre,
+        "-v",
         "update",
         step_args (config_args, step_id::bpkg_update_update),
         step_args (env_args,    step_id::bpkg_update_update),
@@ -654,6 +658,7 @@ build (size_t argc, const char* argv[])
       //
       r.status |= run_bpkg (
         trace, r.log, wre,
+        "-v",
         "test",
         "-d", "..",
         step_args (config_args, step_id::bpkg_test_test),
@@ -699,6 +704,7 @@ build (size_t argc, const char* argv[])
       //
       r.status |= run_bpkg (
         trace, r.log, wre,
+        "-v",
         "install",
         step_args (config_args, step_id::bpkg_install_install),
         step_args (env_args,    step_id::bpkg_install_install),
@@ -814,7 +820,7 @@ build (size_t argc, const char* argv[])
         r.status |= run_b (
           trace, r.log, wre,
           envvars,
-          "-V",
+          "-v",
           "configure(" +
           subprj_src_dir.representation () + '@' +
           subprj_out_dir.representation () + ")",
@@ -866,6 +872,7 @@ build (size_t argc, const char* argv[])
       //
       r.status |= run_bpkg (
         trace, r.log, wre,
+        "-v",
         "uninstall",
         step_args (config_args, step_id::bpkg_uninstall_uninstall),
         step_args (env_args,    step_id::bpkg_uninstall_uninstall),
-- 
cgit v1.1