[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
64/376: nix-daemon: Fix compat with older clients
From: |
Ludovic Courtès |
Subject: |
64/376: nix-daemon: Fix compat with older clients |
Date: |
Wed, 28 Jan 2015 22:04:04 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 8f72e702a114458e92f644160950344a7bf7166a
Author: Eelco Dolstra <address@hidden>
Date: Thu Jul 17 15:23:31 2014 +0200
nix-daemon: Fix compat with older clients
---
src/nix-daemon/nix-daemon.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 265131c..ab9e4b9 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -548,7 +548,7 @@ static void performOp(bool trusted, unsigned int
clientVersion,
settings.set("build-max-jobs", int2String(readInt(from)));
settings.set("build-max-silent-time", int2String(readInt(from)));
if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
- settings.useBuildHook = readInt(from) != 0;
+ if (readInt(from) != 0) settings.useBuildHook = true;
if (GET_PROTOCOL_MINOR(clientVersion) >= 4) {
settings.buildVerbosity = (Verbosity) readInt(from);
logType = (LogType) readInt(from);
- 49/376: Allow $NIX_BUILD_HOOK to be relative to Nix libexec directory, (continued)
- 49/376: Allow $NIX_BUILD_HOOK to be relative to Nix libexec directory, Ludovic Courtès, 2015/01/28
- 52/376: Fix test, Ludovic Courtès, 2015/01/28
- 54/376: build-remote.pl: Don't keep a shell process around, Ludovic Courtès, 2015/01/28
- 55/376: build-remote.pl: Fix building multiple output derivations, Ludovic Courtès, 2015/01/28
- 47/376: Replace message "importing path <...>" with "exporting path <...>", Ludovic Courtès, 2015/01/28
- 58/376: Pass *_proxy vars to bootstrap fetchurl, Ludovic Courtès, 2015/01/28
- 51/376: build-remote.pl: Use ‘nix-store --serve’ on the remote side, Ludovic Courtès, 2015/01/28
- 50/376: Fix closure size display, Ludovic Courtès, 2015/01/28
- 63/376: Get rid of a compiler warning, Ludovic Courtès, 2015/01/28
- 43/376: Remove tabs, Ludovic Courtès, 2015/01/28
- 64/376: nix-daemon: Fix compat with older clients,
Ludovic Courtès <=
- 57/376: Manual: Typo, Ludovic Courtès, 2015/01/28
- 53/376: build-remote.pl: Fix build log, Ludovic Courtès, 2015/01/28
- 61/376: Handle case collisions on case-insensitive systems, Ludovic Courtès, 2015/01/28
- 66/376: nix-daemon: Show name of connecting user, Ludovic Courtès, 2015/01/28
- 59/376: Install systemd and Upstart stuff only on Linux, Ludovic Courtès, 2015/01/28
- 60/376: Make dev-shell script work on Darwin, Ludovic Courtès, 2015/01/28
- 68/376: Ugly hack to fix building on old Darwin, Ludovic Courtès, 2015/01/28
- 75/376: nix-store --serve: Monitor for client disconnects, Ludovic Courtès, 2015/01/28
- 70/376: Better fix for strcasecmp on Darwin, Ludovic Courtès, 2015/01/28
- 73/376: startProcess: Make writing error messages from the child more robust, Ludovic Courtès, 2015/01/28