diff options
author | Linus Heckemann <git@sphalerite.org> | 2022-09-26 20:55:56 +0200 |
---|---|---|
committer | Linus Heckemann <git@sphalerite.org> | 2022-12-07 11:36:48 +0100 |
commit | 8e0946e8df968391d1430af8377bdb51204e4666 (patch) | |
tree | 3e3ad664591e72d47cbecd86c99beb09929a312c /src/libmain/progress-bar.cc | |
parent | 54906bc93c0db36b03ac76b67594403261ffd377 (diff) |
Remove repeat and enforce-determinism options
These only functioned if a very narrow combination of conditions held:
- The result path does not yet exist (--check did not result in
repeated builds), AND
- The result path is not available from any configured substituters, AND
- No remote builders that can build the path are available.
If any of these do not hold, a derivation would be built 0 or 1 times
regardless of the repeat option. Thus, remove it to avoid confusion.
Diffstat (limited to 'src/libmain/progress-bar.cc')
-rw-r--r-- | src/libmain/progress-bar.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc index 961f4e18a..d160a83e9 100644 --- a/src/libmain/progress-bar.cc +++ b/src/libmain/progress-bar.cc @@ -180,10 +180,12 @@ public: auto machineName = getS(fields, 1); if (machineName != "") i->s += fmt(" on " ANSI_BOLD "%s" ANSI_NORMAL, machineName); - auto curRound = getI(fields, 2); - auto nrRounds = getI(fields, 3); - if (nrRounds != 1) - i->s += fmt(" (round %d/%d)", curRound, nrRounds); + + // Used to be curRound and nrRounds, but the + // implementation was broken for a long time. + if (getI(fields, 2) != 1 || getI(fields, 3) != 1) { + throw Error("log message indicated repeating builds, but this is not currently implemented"); + } i->name = DrvName(name).name; } |