Author: eelco Date: 2010-06-22 14:42:34 +0000 (Tue, 22 Jun 2010) New Revision: 22378
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22378&view=rev Modified: nix/branches/sqlite/ nix/branches/sqlite/scripts/build-remote.pl.in Log: * Sync. Changes: Property changes on: nix/branches/sqlite ___________________________________________________________________ Modified: svn:mergeinfo - /nix/branches/fast-eval:20786-21747 /nix/trunk:20098-22351 + /nix/branches/fast-eval:20786-21747 /nix/trunk:20098-22377 Modified: nix/branches/sqlite/scripts/build-remote.pl.in =================================================================== --- nix/branches/sqlite/scripts/build-remote.pl.in 2010-06-22 14:41:22 UTC (rev 22377) +++ nix/branches/sqlite/scripts/build-remote.pl.in 2010-06-22 14:42:34 UTC (rev 22378) @@ -211,14 +211,14 @@ print "building...\n"; -my $buildFlags = "--max-silent-time $maxSilentTime"; +my $buildFlags = "--max-silent-time $maxSilentTime --fallback"; # `-tt' forces allocation of a pseudo-terminal. This is required to # make the remote nix-store process receive a signal when the # connection dies. Without it, the remote process might continue to # run indefinitely (that is, until it next tries to write to # stdout/stderr). -if (system("ssh $hostName @sshOpts -tt 'nix-store --realise $buildFlags $drvPath > /dev/null'") != 0) { +if (system("ssh $hostName @sshOpts -tt 'nix-store -r $drvPath $buildFlags > /dev/null'") != 0) { # If we couldn't run ssh or there was an ssh problem (indicated by # exit code 255), then we return exit code 1; otherwise we assume # that the builder failed, which we indicate to Nix using exit _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
