about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-05-29T16·18+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-05-29T16·18+0200
commitbc2e43f3c826eea5b92a4f255eee59c3bb253cbc (patch)
treea2fbed3ac6636ac9dd26f0797f8db0de373037e2
parent039d5a023f2fd0d28438ca1a9493237c95cc05e1 (diff)
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.
-rwxr-xr-xscripts/build-remote.pl.in4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in
index c8e73cebb4ad..2fb1015e6053 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': $?");
 }