about summary refs log tree commit diff
path: root/src/nix/progress-bar.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-08-28T17·13+0200
committerEelco Dolstra <edolstra@gmail.com>2017-08-28T17·13+0200
commit2cc345b95f19334e7050c7203a5f6823af24344f (patch)
tree0bb381ffa64ceb59fac0ab6416e5699854c0c028 /src/nix/progress-bar.cc
parentcfc813239128fc69a9228b39b5c0abb7e7a67b11 (diff)
Give activities a verbosity level again
And print them (separately from the progress bar) given sufficient -v
flags.
Diffstat (limited to 'src/nix/progress-bar.cc')
-rw-r--r--src/nix/progress-bar.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nix/progress-bar.cc b/src/nix/progress-bar.cc
index 70dbfd4e5964..341866679186 100644
--- a/src/nix/progress-bar.cc
+++ b/src/nix/progress-bar.cc
@@ -126,9 +126,12 @@ public:
         update(state);
     }
 
-    void startActivity(ActivityId act, ActivityType type, const std::string & s,
-        const Fields & fields, ActivityId parent) override
+    void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
+        const std::string & s, const Fields & fields, ActivityId parent) override
     {
+        if (lvl <= verbosity && !s.empty())
+            log(lvl, s + "...");
+
         auto state(state_.lock());
 
         state->activities.emplace_back(ActInfo());