aboutsummaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-14 11:01:18 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-14 11:01:18 +0200
commitf1adf4c998c374b3857f2e252cb698463e624059 (patch)
tree4cd30dd4aeb6fade17d0b01c269476494c12df89 /perl
parenta79e56de68e8adf508dc613b39f25ad2f431d5b4 (diff)
Remove unused @sshOpts flag
Closes #300.
Diffstat (limited to 'perl')
-rw-r--r--perl/lib/Nix/CopyClosure.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl/lib/Nix/CopyClosure.pm b/perl/lib/Nix/CopyClosure.pm
index 91b418bbf..1520f1012 100644
--- a/perl/lib/Nix/CopyClosure.pm
+++ b/perl/lib/Nix/CopyClosure.pm
@@ -47,12 +47,12 @@ sub copyToOpen {
sub copyTo {
- my ($sshHost, $sshOpts, $storePaths, $includeOutputs, $dryRun, $sign, $useSubstitutes) = @_;
+ my ($sshHost, $storePaths, $includeOutputs, $dryRun, $sign, $useSubstitutes) = @_;
# Connect to the remote host.
my ($from, $to);
eval {
- ($from, $to) = connectToRemoteNix($sshHost, $sshOpts);
+ ($from, $to) = connectToRemoteNix($sshHost, []);
};
if ($@) {
chomp $@;
@@ -69,7 +69,7 @@ sub copyTo {
# For backwards compatibility with Nix <= 1.7. Will be removed
# eventually.
sub oldCopyTo {
- my ($sshHost, $sshOpts, $storePaths, $includeOutputs, $dryRun, $sign, $useSubstitutes) = @_;
+ my ($sshHost, $storePaths, $includeOutputs, $dryRun, $sign, $useSubstitutes) = @_;
# Get the closure of this path.
my @closure = reverse(topoSortPaths(computeFSClosure(0, $includeOutputs,
@@ -77,7 +77,7 @@ sub oldCopyTo {
# Optionally use substitutes on the remote host.
if (!$dryRun && $useSubstitutes) {
- system "ssh $sshHost @{$sshOpts} @globalSshOpts nix-store -r --ignore-unknown @closure";
+ system "ssh $sshHost @globalSshOpts nix-store -r --ignore-unknown @closure";
# Ignore exit status because this is just an optimisation.
}
@@ -89,7 +89,7 @@ sub oldCopyTo {
my $missingSize = 0;
while (scalar(@closure) > 0) {
my @ps = splice(@closure, 0, 1500);
- open(READ, "set -f; ssh $sshHost @{$sshOpts} @globalSshOpts nix-store --check-validity --print-invalid @ps|");
+ open(READ, "set -f; ssh $sshHost @globalSshOpts nix-store --check-validity --print-invalid @ps|");
while (<READ>) {
chomp;
push @missing, $_;
@@ -103,7 +103,7 @@ sub oldCopyTo {
if (scalar @missing > 0) {
print STDERR "copying ", scalar @missing, " missing paths to ‘$sshHost’...\n";
unless ($dryRun) {
- open SSH, "| ssh $sshHost @{$sshOpts} @globalSshOpts 'nix-store --import' > /dev/null" or die;
+ open SSH, "| ssh $sshHost @globalSshOpts 'nix-store --import' > /dev/null" or die;
exportPaths(fileno(SSH), $sign, @missing);
close SSH or die "copying store paths to remote machine ‘$sshHost’ failed: $?";
}