[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
250/376: Remove unused @sshOpts flag
From: |
Ludovic Courtès |
Subject: |
250/376: Remove unused @sshOpts flag |
Date: |
Wed, 28 Jan 2015 22:05:24 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit f1adf4c998c374b3857f2e252cb698463e624059
Author: Eelco Dolstra <address@hidden>
Date: Tue Oct 14 11:01:18 2014 +0200
Remove unused @sshOpts flag
Closes #300.
---
perl/lib/Nix/CopyClosure.pm | 12 ++++++------
scripts/nix-copy-closure.in | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/perl/lib/Nix/CopyClosure.pm b/perl/lib/Nix/CopyClosure.pm
index 91b418b..1520f10 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: $?";
}
diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in
index 875ca98..97ee88a 100755
--- a/scripts/nix-copy-closure.in
+++ b/scripts/nix-copy-closure.in
@@ -74,13 +74,13 @@ die "$0: you did not specify a host name\n" unless defined
$sshHost;
if ($toMode) { # Copy TO the remote machine.
Nix::CopyClosure::copyTo(
- $sshHost, [ @sshOpts ], [ @storePaths ],
+ $sshHost, [ @storePaths ],
$includeOutputs, $dryRun, $sign, $useSubstitutes);
}
else { # Copy FROM the remote machine.
- my ($from, $to) = connectToRemoteNix($sshHost, [ @sshOpts ]);
+ my ($from, $to) = connectToRemoteNix($sshHost);
# Query the closure of the given store paths on the remote
# machine. Paths are assumed to be store paths; there is no
- 238/376: Add test for readDir primop, (continued)
- 238/376: Add test for readDir primop, Ludovic Courtès, 2015/01/28
- 240/376: Remove some duplicate code, Ludovic Courtès, 2015/01/28
- 239/376: Add readDir primop, Ludovic Courtès, 2015/01/28
- 224/376: add manpage for nix-generate-patches, Ludovic Courtès, 2015/01/28
- 246/376: Typo, Ludovic Courtès, 2015/01/28
- 245/376: Get rid of some unnecessary ExprConcatStrings nodes in dynamic attrs, Ludovic Courtès, 2015/01/28
- 243/376: Add primop ‘catAttrs’, Ludovic Courtès, 2015/01/28
- 249/376: nix-copy-closure: Use strict, Ludovic Courtès, 2015/01/28
- 241/376: Tweak, Ludovic Courtès, 2015/01/28
- 304/376: Combine introduction / quick start parts, Ludovic Courtès, 2015/01/28
- 250/376: Remove unused @sshOpts flag,
Ludovic Courtès <=
- 305/376: Update quick start section, Ludovic Courtès, 2015/01/28
- 306/376: Update installation section, Ludovic Courtès, 2015/01/28
- 308/376: Build derivations in a more predictable order, Ludovic Courtès, 2015/01/28
- 307/376: Don't create unnecessary substitution goals for derivations, Ludovic Courtès, 2015/01/28
- 309/376: More build-cache-failures -> build-cache-failure, Ludovic Courtès, 2015/01/28
- 310/376: forceString(): Accept pos argument, Ludovic Courtès, 2015/01/28
- 311/376: Add a primop for regular expression pattern matching, Ludovic Courtès, 2015/01/28
- 312/376: Rely on XML catalogs to find the DocBook schemas and stylesheets, Ludovic Courtès, 2015/01/28
- 313/376: Intro: Mention binary caches, Ludovic Courtès, 2015/01/28
- 303/376: Manual: Bump date, Ludovic Courtès, 2015/01/28