From b6c768fb6a341bf1c5fe4a2d2a929415e8519b25 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 May 2016 12:53:24 +0200
Subject: nix-daemon: Fix queryPathInfo() backward compatibility

---
 src/nix-daemon/nix-daemon.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/nix-daemon')

diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 60ad85a68831..bc05b85f4923 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -518,14 +518,18 @@ static void performOp(ref<LocalStore> store, bool trusted, unsigned int clientVe
         }
         stopWork();
         if (info) {
-            to << 1 << info->deriver << printHash(info->narHash) << info->references
+            if (GET_PROTOCOL_MINOR(clientVersion) >= 17)
+                to << 1;
+            to << info->deriver << printHash(info->narHash) << info->references
                << info->registrationTime << info->narSize;
             if (GET_PROTOCOL_MINOR(clientVersion) >= 16) {
                 to << info->ultimate
                    << info->sigs;
             }
-        } else
+        } else {
+            assert(GET_PROTOCOL_MINOR(clientVersion) >= 17);
             to << 0;
+        }
         break;
     }
 
-- 
cgit 1.4.1