Skip to content

Commit 227114d

Browse files
committed
Remove startProgressBar()
1 parent 1aee6cf commit 227114d

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

src/libmain/progress-bar.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -560,9 +560,4 @@ std::unique_ptr<Logger> makeProgressBar()
560560
return std::make_unique<ProgressBar>(isTTY());
561561
}
562562

563-
void startProgressBar()
564-
{
565-
logger = makeProgressBar();
566-
}
567-
568563
}

src/libmain/progress-bar.hh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ namespace nix {
77

88
std::unique_ptr<Logger> makeProgressBar();
99

10-
void startProgressBar();
11-
1210
}

src/nix/prefetch.cc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "store-api.hh"
55
#include "filetransfer.hh"
66
#include "finally.hh"
7-
#include "progress-bar.hh"
7+
#include "loggers.hh"
88
#include "tarfile.hh"
99
#include "attr-path.hh"
1010
#include "eval-inline.hh"
@@ -190,10 +190,7 @@ static int main_nix_prefetch_url(int argc, char * * argv)
190190
if (args.size() > 2)
191191
throw UsageError("too many arguments");
192192

193-
Finally f([]() { logger->stop(); });
194-
195-
if (isTTY())
196-
startProgressBar();
193+
setLogFormat("bar");
197194

198195
auto store = openStore();
199196
auto state = std::make_unique<EvalState>(myArgs.lookupPath, store, fetchSettings, evalSettings);

0 commit comments

Comments
 (0)