nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-17 16:02:43 +01:00
Code Activity

* Flag `--no-build-hook' to disable distributed builds.

Browse source 
* queryDeriver in daemon mode: don't barf if the other side returns an
  empty string (which means there is no deriver).
This commit is contained in:
Eelco Dolstra 2007-11-16 16:15:26 +00:00
parent c05783ad67
commit c370755583
9 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/remote-store.cc
View file

@ -59,7 +59,7 @@ RemoteStore::RemoteStore()
unsigned int magic = readInt(from);
if (magic != WORKER_MAGIC_2) throw Error("protocol mismatch");
unsigned int daemonVersion = readInt(from);
daemonVersion = readInt(from);
if (GET_PROTOCOL_MAJOR(daemonVersion) != GET_PROTOCOL_MAJOR(PROTOCOL_VERSION))
throw Error("Nix daemon protocol version not supported");
writeInt(PROTOCOL_VERSION, to);
@ -169,6 +169,8 @@ void RemoteStore::setOptions()
writeInt(verbosity, to);
writeInt(maxBuildJobs, to);
writeInt(maxSilentTime, to);
if (GET_PROTOCOL_MINOR(daemonVersion) >= 2)
writeInt(useBuildHook, to);
processStderr();
}
@ -230,7 +232,9 @@ Path RemoteStore::queryDeriver(const Path & path)
writeInt(wopQueryDeriver, to);
writeString(path, to);
processStderr();
return readStorePath(from);
Path drvPath = readString(from);
if (drvPath != "") assertStorePath(drvPath);
return drvPath;
}