Merge branch 'master' into no-manifests

1 files changed, 5 insertions, 5 deletions

diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc
index 8ccafca29d0c..dadde9cc5183 100644
--- a/src/nix-worker/nix-worker.cc
+++ b/src/nix-worker/nix-worker.cc
@@ -521,7 +521,7 @@ static void performOp(unsigned int clientVersion,
 
         writeStrings(results.paths, to);
         writeLongLong(results.bytesFreed, to);
-        writeLongLong(results.blocksFreed, to);
+        writeLongLong(0, to); // obsolete
 
         break;
     }
@@ -661,6 +661,10 @@ static void processConnection()
     to.flush();
     unsigned int clientVersion = readInt(from);
 
+    bool reserveSpace = true;
+    if (GET_PROTOCOL_MINOR(clientVersion) >= 11)
+        reserveSpace = readInt(from) != 0;
+
     /* Send startup error messages to the client. */
     startWork();
 
@@ -676,10 +680,6 @@ static void processConnection()
             throw Error("if you run `nix-worker' as root, then you MUST set `build-users-group'!");
 #endif
 
-        bool reserveSpace = true;
-        if (GET_PROTOCOL_MINOR(clientVersion) >= 11)
-            reserveSpace = readInt(from) != 0;
-
         /* Open the store. */
         store = boost::shared_ptr<StoreAPI>(new LocalStore(reserveSpace));