aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/remote-store.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-08-30 14:53:03 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-08-30 14:53:03 +0000
commit80e722278ca03bf303961e2f27487dc98d042803 (patch)
tree2388ec8b32f76de20353c713f2fe580a5aab5b08 /src/libstore/remote-store.cc
parent20acd43c25a388f5c31c2ee601f1cac88cf12f7b (diff)
* When using the build hook, distinguish between the stderr of the
hook script proper, and the stdout/stderr of the builder. Only the latter should be saved in /nix/var/log/nix/drvs. * Allow the verbosity to be set through an option. * Added a flag --quiet to lower the verbosity level.
Diffstat (limited to 'src/libstore/remote-store.cc')
-rw-r--r--src/libstore/remote-store.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 8f162daee..92d517bbb 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -97,10 +97,6 @@ void RemoteStore::forkSlave()
if (worker == "")
worker = nixBinDir + "/nix-worker";
- string verbosityArg = "-";
- for (int i = 1; i < verbosity; ++i)
- verbosityArg += "v";
-
child = fork();
switch (child) {
@@ -120,10 +116,7 @@ void RemoteStore::forkSlave()
close(fdSocket);
close(fdChild);
- execlp(worker.c_str(), worker.c_str(), "--slave",
- /* hacky - must be at the end */
- verbosityArg == "-" ? NULL : verbosityArg.c_str(),
- NULL);
+ execlp(worker.c_str(), worker.c_str(), "--slave", NULL);
throw SysError(format("executing `%1%'") % worker);