diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-04-17 18:08:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 18:08:05 +0200 |
| commit | 3f9589f17e9e03aeb45b70f436c25227c728ba51 (patch) | |
| tree | 347724e73ffcc1f437ee2665434d097ed1b5ea0c /src/nix-store | |
| parent | 39e0f609cce54276ebfd9ac647364b49c73120b0 (diff) | |
| parent | 24866b71c40f0fcb5a601d90d4f87366fe626090 (diff) | |
Merge pull request #6312 from obsidiansystems/keyed-build-result
Shuffle `BuildResult` data definition, make state machine clearer, introduce `SingleDrvOutputs`
Diffstat (limited to 'src/nix-store')
| -rw-r--r-- | src/nix-store/nix-store.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 03fc93962..40f30eb63 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -941,7 +941,10 @@ static void opServe(Strings opFlags, Strings opArgs) if (GET_PROTOCOL_MINOR(clientVersion) >= 3) out << status.timesBuilt << status.isNonDeterministic << status.startTime << status.stopTime; if (GET_PROTOCOL_MINOR(clientVersion) >= 6) { - worker_proto::write(*store, out, status.builtOutputs); + DrvOutputs builtOutputs; + for (auto & [output, realisation] : status.builtOutputs) + builtOutputs.insert_or_assign(realisation.id, realisation); + worker_proto::write(*store, out, builtOutputs); } break; |