tvl-depot/src
aszlig 6567ab95a0
build-remote: Fix missing log output
The storeUri variable in the build-remote hook is declared very much to
the start of the main function and a bunch of lines later, the same
variable gets checked via hasPrefix() but it gets assigned *after* that
check when the most suitable machine for the build was choosen.

So I guess this was just a typo in d16fd24973
and what we really want is to either checkd the prefix *after* assigning
storeUri or use bestMachine->storeUri directly.

I choose the latter, because the former could introduce even more
regressions if the try block where the variable gets assigned terminates
early.

Nevertheless, the reason why the log output didn't work is because
hasPrefix() checked for "ssh://" in front of storeUri, but if the
storeUri isn't set correctly (or at all), we don't get the log file
descriptor set up properly, leading to no log output.

I've adjusted the remote-builds test to include a regression test for
this, so that we can make sure we get a build output when using remote
builds.

In addition to that I've tested this with two of my build farms and the
build logs are emitted correctly again.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-25 01:34:18 +01:00
..
boost Shut up some warnings 2017-04-14 14:42:20 +02:00
build-remote build-remote: Fix missing log output 2017-11-25 01:34:18 +01:00
buildenv Improve error message for conflicting priorities 2017-09-21 10:25:20 +09:00
libexpr nix-shell/nix-build: Support .drv files again 2017-11-24 18:08:35 +01:00
libmain anchor nix::Exit exception 2017-11-14 12:39:30 -06:00
libstore nix path-info: Show URL of NARs in binary caches 2017-11-24 18:08:50 +01:00
libutil Propagate flags like --sandbox to the daemon properly 2017-11-21 18:50:56 +01:00
linenoise Replace readline by linenoise 2017-05-10 18:37:42 +02:00
nix nix eval --raw: Use coerceToString() 2017-11-20 18:27:29 +01:00
nix-build nix-shell/nix-build: Support .drv files again 2017-11-24 18:08:35 +01:00
nix-channel Replace Unicode quotes in user-facing strings by ASCII 2017-07-30 12:32:45 +01:00
nix-collect-garbage printMsg(lvlError, ...) -> printError(...) etc. 2016-09-21 16:54:53 +02:00
nix-copy-closure Replace Unicode quotes in user-facing strings by ASCII 2017-07-30 12:32:45 +01:00
nix-daemon Remove the remote-builds option 2017-10-24 11:00:16 +02:00
nix-env nix: Respect -I, --arg, --argstr 2017-10-24 12:58:34 +02:00
nix-instantiate nix: Respect -I, --arg, --argstr 2017-10-24 12:58:34 +02:00
nix-prefetch-url nix: Respect -I, --arg, --argstr 2017-10-24 12:58:34 +02:00
nix-store Pass lists/attrsets to bash as (associative) arrays 2017-10-25 13:01:50 +02:00
resolve-system-dependencies Replace Unicode quotes in user-facing strings by ASCII 2017-07-30 12:32:45 +01:00