aboutsummaryrefslogtreecommitdiff
path: root/src/libmain/progress-bar.cc
diff options
context:
space:
mode:
authorAlexander Bantyev <balsoft@balsoft.ru>2023-03-16 13:34:48 +0400
committerAlexander Bantyev <balsoft@balsoft.ru>2023-03-22 09:45:08 +0400
commit85a2d1d94fbb682d4ff1e85ee083fac55b6bc9cb (patch)
treebc88e677d90c644652765834792afdcbe4f63878 /src/libmain/progress-bar.cc
parent5291a82cd9b9d8d7cd6b8338a5224c94c6f23eb7 (diff)
Add a test for nix copy over ssh
Check that nix copy can copy stuff, refuses to copy unsigned paths by default, and doesn't hide the ssh password prompt.
Diffstat (limited to 'src/libmain/progress-bar.cc')
-rw-r--r--src/libmain/progress-bar.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc
index 882deb169..6600ec177 100644
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@@ -129,6 +129,7 @@ public:
void resume() override {
state_.lock()->paused = false;
writeToStderr("\r\e[K");
+ state_.lock()->haveUpdate = true;
updateCV.notify_one();
}
@@ -350,9 +351,8 @@ public:
{
auto nextWakeup = std::chrono::milliseconds::max();
- if (state.paused) return nextWakeup;
state.haveUpdate = false;
- if (!state.active) return nextWakeup;
+ if (state.paused || !state.active) return nextWakeup;
std::string line;