lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Don't call "cat".

Browse source
This commit is contained in:
Eelco Dolstra 2010-08-25 12:19:30 +00:00
parent 95deba581d
commit 1a396f3789
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/build-remote.pl.in
View file

@ -194,11 +194,8 @@ if ($x ne "okay") {
print STDERR "building `$drvPath' on `$hostName'\n"; print STDERR "building `$drvPath' on `$hostName'\n";
my $inputs = `cat inputs`; die if ($? != 0); my @inputs = split /\s/, do { local $/; local @ARGV = "inputs"; <> };
$inputs =~ s/\n/ /g; my @outputs = split /\s/, do { local $/; local @ARGV = "outputs"; <> };
my $outputs = `cat outputs`; die if ($? != 0);
$outputs =~ s/\n/ /g;
my $maybeSign = ""; my $maybeSign = "";
$maybeSign = "--sign" if -e "/nix/etc/nix/signing-key.sec"; $maybeSign = "--sign" if -e "/nix/etc/nix/signing-key.sec";
@ -217,7 +214,7 @@ sub removeRoots {
# Copy the derivation and its dependencies to the build machine. # Copy the derivation and its dependencies to the build machine.
system("NIX_SSHOPTS=\"@sshOpts\" @bindir@/nix-copy-closure $hostName $maybeSign $drvPath $inputs") == 0 system("NIX_SSHOPTS=\"@sshOpts\" @bindir@/nix-copy-closure $hostName $maybeSign $drvPath @inputs") == 0
or die "cannot copy inputs to $hostName: $?"; or die "cannot copy inputs to $hostName: $?";
@ -245,7 +242,7 @@ print "build of `$drvPath' on `$hostName' succeeded\n";
# Copy the output from the build machine. # Copy the output from the build machine.
foreach my $output (split '\n', $outputs) { foreach my $output (@outputs) {
my $maybeSignRemote = ""; my $maybeSignRemote = "";
$maybeSignRemote = "--sign" if $UID != 0; $maybeSignRemote = "--sign" if $UID != 0;