From bc2e43f3c826eea5b92a4f255eee59c3bb253cbc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 May 2013 18:18:59 +0200 Subject: [PATCH] build-remote.pl: Remove meaningless signing when importing the output paths The "$UID != 0" makes no sense: if the local side has write access to the Nix store (which is always the case) then it doesn't matter if we're root - we can import unsigned paths either way. --- scripts/build-remote.pl.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in index c8e73cebb4..2fb1015e60 100755 --- a/scripts/build-remote.pl.in +++ b/scripts/build-remote.pl.in @@ -291,9 +291,7 @@ if (system("exec ssh $hostName @sshOpts '(read; kill -INT -\$\$) <&0 & exec nix- # Copy the output from the build machine. my @outputs2 = grep { !isValidPath($_) } @outputs; if (scalar @outputs2 > 0) { - my $maybeSignRemote = ""; - $maybeSignRemote = "--sign" if $UID != 0; - system("exec ssh $hostName @sshOpts 'nix-store --export $maybeSignRemote @outputs2'" . + system("exec ssh $hostName @sshOpts 'nix-store --export @outputs2'" . "| NIX_HELD_LOCKS='@outputs2' @bindir@/nix-store --import > /dev/null") == 0 or die("cannot copy paths " . join(", ", @outputs) . " from `$hostName': $?"); }