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

build-remote.pl: Remove meaningless signing when importing the output paths

Browse source 
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.
This commit is contained in:
Eelco Dolstra 2013-05-29 18:18:59 +02:00
parent 039d5a023f
commit bc2e43f3c8
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,9 +291,7 @@ if (system("exec ssh $hostName @sshOpts '(read; kill -INT -\$\$) <&0 & exec nix-
# Copy the output from the build machine. # Copy the output from the build machine.
my @outputs2 = grep { !isValidPath($_) } @outputs; my @outputs2 = grep { !isValidPath($_) } @outputs;
if (scalar @outputs2 > 0) { if (scalar @outputs2 > 0) {
my $maybeSignRemote = ""; system("exec ssh $hostName @sshOpts 'nix-store --export @outputs2'" .
$maybeSignRemote = "--sign" if $UID != 0;
system("exec ssh $hostName @sshOpts 'nix-store --export $maybeSignRemote @outputs2'" .
"| NIX_HELD_LOCKS='@outputs2' @bindir@/nix-store --import > /dev/null") == 0 "| NIX_HELD_LOCKS='@outputs2' @bindir@/nix-store --import > /dev/null") == 0
or die("cannot copy paths " . join(", ", @outputs) . " from `$hostName': $?"); or die("cannot copy paths " . join(", ", @outputs) . " from `$hostName': $?");
} }