diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-08-28T17·13+0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-08-28T17·13+0200 |
commit | 2cc345b95f19334e7050c7203a5f6823af24344f (patch) | |
tree | 0bb381ffa64ceb59fac0ab6416e5699854c0c028 /src/nix | |
parent | cfc813239128fc69a9228b39b5c0abb7e7a67b11 (diff) |
Give activities a verbosity level again
And print them (separately from the progress bar) given sufficient -v flags.
Diffstat (limited to 'src/nix')
-rw-r--r-- | src/nix/progress-bar.cc | 7 | ||||
-rw-r--r-- | src/nix/verify.cc | 2 |
2 files changed, 6 insertions, 3 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()); diff --git a/src/nix/verify.cc b/src/nix/verify.cc index 7156341396d3..4913d990097d 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -79,7 +79,7 @@ struct CmdVerify : StorePathsCommand try { checkInterrupt(); - Activity act2(*logger, actUnknown, fmt("checking '%s'", storePath)); + Activity act2(*logger, lvlInfo, actUnknown, fmt("checking '%s'", storePath)); MaintainCount<std::atomic<size_t>> mcActive(active); update(); |