From eb264e1892c2a1379fa3bcab9aefea219e8e7138 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 8 Sep 2015 10:56:32 +0200
Subject: Rework diagnostics verbosity, add quiet mode/option

---
 build/context.txx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'build/context.txx')

diff --git a/build/context.txx b/build/context.txx
index eb1568c..a0660f9 100644
--- a/build/context.txx
+++ b/build/context.txx
@@ -27,9 +27,9 @@ namespace build
     }
     catch (const std::system_error& e)
     {
-      if (verb)
+      if (verb >= 2)
         text << "rm " << f;
-      else
+      else if (verb)
         text << "rm " << t;
 
       fail << "unable to remove file " << f << ": " << e.what ();
@@ -37,9 +37,9 @@ namespace build
 
     if (rs == rmfile_status::success)
     {
-      if (verb)
+      if (verb >= 2)
         text << "rm " << f;
-      else
+      else if (verb)
         text << "rm " << t;
     }
 
@@ -66,9 +66,9 @@ namespace build
     }
     catch (const std::system_error& e)
     {
-      if (verb)
+      if (verb >= 2)
         text << "rmdir " << d;
-      else
+      else if (verb)
         text << "rmdir " << t;
 
       fail << "unable to remove directory " << d << ": " << e.what ();
@@ -78,16 +78,16 @@ namespace build
     {
     case rmdir_status::success:
       {
-        if (verb)
+        if (verb >= 2)
           text << "rmdir " << d;
-        else
+        else if (verb)
           text << "rmdir " << t;
 
         break;
       }
     case rmdir_status::not_empty:
       {
-        if (verb)
+        if (verb >= 2)
           text << "directory " << d << " is "
                << (w ? "current working directory" : "not empty")
                << ", not removing";
-- 
cgit v1.1