[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
71/376: Revert old useBuildHook behaviour
From: |
Ludovic Courtès |
Subject: |
71/376: Revert old useBuildHook behaviour |
Date: |
Wed, 28 Jan 2015 22:04:07 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit ee3c5d7916b48d0c3b1cc08044e27209c14acfdc
Author: Eelco Dolstra <address@hidden>
Date: Sat Jul 19 02:25:47 2014 +0200
Revert old useBuildHook behaviour
---
src/libstore/build.cc | 2 +-
src/libstore/globals.cc | 2 +-
src/nix-daemon/nix-daemon.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index d594706..4376a83 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1505,7 +1505,7 @@ void DerivationGoal::buildDone()
HookReply DerivationGoal::tryBuildHook()
{
- if (!settings.useBuildHook) return rpDecline;
+ if (!settings.useBuildHook || getEnv("NIX_BUILD_HOOK") == "") return
rpDecline;
if (!worker.hook)
worker.hook = std::shared_ptr<HookInstance>(new HookInstance);
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 2bfebb7..28982ec 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -39,7 +39,7 @@ Settings::Settings()
thisSystem = SYSTEM;
maxSilentTime = 0;
buildTimeout = 0;
- useBuildHook = getEnv("NIX_BUILD_HOOK") != "";
+ useBuildHook = true;
printBuildTrace = false;
reservedSize = 1024 * 1024;
fsyncMetadata = true;
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index dde501d..f2141ee 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -552,7 +552,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)
- if (readInt(from) != 0) settings.useBuildHook = true;
+ settings.useBuildHook = readInt(from) != 0;
if (GET_PROTOCOL_MINOR(clientVersion) >= 4) {
settings.buildVerbosity = (Verbosity) readInt(from);
logType = (LogType) readInt(from);
- 66/376: nix-daemon: Show name of connecting user, (continued)
- 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
- 67/376: nix-daemon: Add trusted-users and allowed-users options, Ludovic Courtès, 2015/01/28
- 56/376: Remove cruft, Ludovic Courtès, 2015/01/28
- 76/376: nix-daemon: Simplify stderr handling, Ludovic Courtès, 2015/01/28
- 71/376: Revert old useBuildHook behaviour,
Ludovic Courtès <=
- 65/376: nix-daemon: Only print connection info if we have SO_PEERCRED, Ludovic Courtès, 2015/01/28
- 69/376: Bump, Ludovic Courtès, 2015/01/28
- 62/376: Be more strict about file names in NARs, Ludovic Courtès, 2015/01/28
- 78/376: Pass -pthread only for programs that need it, Ludovic Courtès, 2015/01/28
- 80/376: Remove some dead code, Ludovic Courtès, 2015/01/28
- 72/376: Remove dead code, Ludovic Courtès, 2015/01/28
- 81/376: Add some assertions, Ludovic Courtès, 2015/01/28
- 82/376: More debugging, Ludovic Courtès, 2015/01/28
- 85/376: tests/remote-builds.nix: Don't try cache.nixos.org, Ludovic Courtès, 2015/01/28
- 79/376: Remove some obsolete files, Ludovic Courtès, 2015/01/28