[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
171/376: Fix build-remote.pl
From: |
Ludovic Courtès |
Subject: |
171/376: Fix build-remote.pl |
Date: |
Wed, 28 Jan 2015 22:04:48 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit e74113a305edbbf1de6acc2560fbfded56299ed4
Author: Eelco Dolstra <address@hidden>
Date: Fri Sep 5 11:43:14 2014 +0200
Fix build-remote.pl
Apparently, turning on utf8 encoding on stderr changes its flushing
behaviour, causing sendReply to not send anything.
http://hydra.nixos.org/build/13944384
---
scripts/build-remote.pl.in | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in
index faf1616..f74ba78 100755
--- a/scripts/build-remote.pl.in
+++ b/scripts/build-remote.pl.in
@@ -10,8 +10,11 @@ use Nix::CopyClosure;
use Nix::Store;
no warnings('once');
+STDERR->autoflush(1);
binmode STDERR, ":encoding(utf8)";
+my $debug = defined $ENV{NIX_DEBUG_HOOK};
+
# General operation:
#
@@ -151,7 +154,7 @@ REQ: while (1) {
}
}
- if (defined $ENV{NIX_DEBUG_HOOK}) {
+ if ($debug) {
print STDERR "load on " . $_->{machine}->{hostName} . " = " .
$_->{load} . "\n"
foreach @available;
}
- 162/376: Introduce allowedRequisites feature, (continued)
- 162/376: Introduce allowedRequisites feature, Ludovic Courtès, 2015/01/28
- 157/376: Fix tests, Ludovic Courtès, 2015/01/28
- 151/376: Use pager for more commands, Ludovic Courtès, 2015/01/28
- 153/376: Fix a segfault in ‘nix-env -qa’, Ludovic Courtès, 2015/01/28
- 164/376: allowedRequisites: Drop stdenv mention, Ludovic Courtès, 2015/01/28
- 160/376: Fix building with Clang, Ludovic Courtès, 2015/01/28
- 170/376: Fix dependency ordering, Ludovic Courtès, 2015/01/28
- 169/376: Hack for supporting Boost on Homebrew, Ludovic Courtès, 2015/01/28
- 166/376: Shut up "Wide character" warnings in Perl scripts, Ludovic Courtès, 2015/01/28
- 167/376: Add an 'optimiseStore' remote procedure call., Ludovic Courtès, 2015/01/28
- 171/376: Fix build-remote.pl,
Ludovic Courtès <=
- 172/376: tests/remote-builds.nix: Time out faster, Ludovic Courtès, 2015/01/28
- 176/376: Add support for using a build directory, Ludovic Courtès, 2015/01/28
- 178/376: Support specifying a JAR manifest, Ludovic Courtès, 2015/01/28
- 181/376: Add some hyperlinks between NIXPATH and -I, Ludovic Courtès, 2015/01/28
- 165/376: Add disallowedReferences / disallowedRequisites, Ludovic Courtès, 2015/01/28
- 173/376: Tweak, Ludovic Courtès, 2015/01/28
- 168/376: Fix boost::too_many_args error, Ludovic Courtès, 2015/01/28
- 174/376: build-remote.pl: UTF-8-decode errors, Ludovic Courtès, 2015/01/28
- 180/376: Don't rely on process substitution, Ludovic Courtès, 2015/01/28
- 177/376: Improved support for building JARs, Ludovic Courtès, 2015/01/28