Merge remote-tracking branch 'upstream/master' into ca-drv-exotic

1 files changed, 6 insertions, 1 deletions

diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 139a05587..d3b9988c9 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -641,7 +641,10 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
             to << res.timesBuilt << res.isNonDeterministic << res.startTime << res.stopTime;
         }
         if (GET_PROTOCOL_MINOR(clientVersion) >= 28) {
-            worker_proto::write(*store, to, res.builtOutputs);
+            DrvOutputs builtOutputs;
+            for (auto & [output, realisation] : res.builtOutputs)
+                builtOutputs.insert_or_assign(realisation.id, realisation);
+            worker_proto::write(*store, to, builtOutputs);
         }
         break;
     }
@@ -1068,6 +1071,8 @@ void processConnection(
 
             opCount++;
 
+            debug("performing daemon worker op: %d", op);
+
             try {
                 performOp(tunnelLogger, store, trusted, recursive, clientVersion, from, to, op);
             } catch (Error & e) {