diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-remote.pl.in | 6 | ||||
| -rwxr-xr-x | scripts/nix-copy-closure.in | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in index bd8b44025785..4bf42941116f 100755 --- a/scripts/build-remote.pl.in +++ b/scripts/build-remote.pl.in @@ -223,10 +223,6 @@ my @inputs = split /\s/, readline(STDIN); my @outputs = split /\s/, readline(STDIN); -my $maybeSign = ""; -$maybeSign = "--sign" if -e "$Nix::Config::confDir/signing-key.sec"; - - # Copy the derivation and its dependencies to the build machine. This # is guarded by an exclusive lock per machine to prevent multiple # build-remote instances from copying to a machine simultaneously. @@ -250,7 +246,7 @@ if ($@) { print STDERR "somebody is hogging $uploadLock, continuing...\n"; unlink $uploadLock; } -Nix::CopyClosure::copyToOpen($from, $to, $hostName, [ $drvPath, @inputs ], 0, 0, $maybeSign ne ""); +Nix::CopyClosure::copyToOpen($from, $to, $hostName, [ $drvPath, @inputs ], 0, 0); close UPLOADLOCK; diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in index 9cbb4ede51a3..0078d7267353 100755 --- a/scripts/nix-copy-closure.in +++ b/scripts/nix-copy-closure.in @@ -12,7 +12,7 @@ binmode STDERR, ":encoding(utf8)"; if (scalar @ARGV < 1) { print STDERR <<EOF -Usage: nix-copy-closure [--from | --to] HOSTNAME [--sign] [--gzip] [--bzip2] [--xz] PATHS... +Usage: nix-copy-closure [--from | --to] HOSTNAME [--gzip] [--bzip2] [--xz] PATHS... EOF ; exit 1; @@ -21,7 +21,6 @@ EOF # Get the target host. my $sshHost; -my $sign = 0; my $toMode = 1; my $includeOutputs = 0; my $dryRun = 0; @@ -38,9 +37,6 @@ while (@ARGV) { if ($arg eq "--help") { exec "man nix-copy-closure" or die; } - elsif ($arg eq "--sign") { - $sign = 1; - } elsif ($arg eq "--gzip" || $arg eq "--bzip2" || $arg eq "--xz") { warn "$0: ‘$arg’ is not implemented\n" if $arg ne "--gzip"; push @globalSshOpts, "-C"; @@ -81,7 +77,7 @@ die "$0: you did not specify a host name\n" unless defined $sshHost; if ($toMode) { # Copy TO the remote machine. Nix::CopyClosure::copyTo( $sshHost, [ @storePaths ], - $includeOutputs, $dryRun, $sign, $useSubstitutes); + $includeOutputs, $dryRun, $useSubstitutes); } else { # Copy FROM the remote machine. @@ -99,7 +95,7 @@ else { # Copy FROM the remote machine. if (scalar @missing > 0) { print STDERR "copying ", scalar @missing, " missing paths from ‘$sshHost’...\n"; writeInt(5, $to); # == cmdExportPaths - writeInt($sign ? 1 : 0, $to); + writeInt(0, $to); # obsolete writeStrings(\@missing, $to); importPaths(fileno($from)); } |