[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
133/376: Fix download-via-ssh
From: |
Ludovic Courtès |
Subject: |
133/376: Fix download-via-ssh |
Date: |
Wed, 28 Jan 2015 22:04:32 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit ad716378dc19c9e5282ce2de77a323a8d4178cd0
Author: Eelco Dolstra <address@hidden>
Date: Sun Aug 17 14:28:17 2014 +0200
Fix download-via-ssh
http://hydra.nixos.org/build/13286020
---
src/download-via-ssh/download-via-ssh.cc | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/download-via-ssh/download-via-ssh.cc
b/src/download-via-ssh/download-via-ssh.cc
index ac0f582..3f6f07f 100644
--- a/src/download-via-ssh/download-via-ssh.cc
+++ b/src/download-via-ssh/download-via-ssh.cc
@@ -94,11 +94,13 @@ static void query(std::pair<FdSink, FdSource> & pipes)
int main(int argc, char * * argv)
{
return handleExceptions(argv[0], [&]() {
- initNix();
-
if (argc < 2)
throw UsageError("download-via-ssh requires an argument");
+ initNix();
+
+ settings.update();
+
if (settings.sshSubstituterHosts.empty())
return;
- 126/376: Handle compound single dash options properly, (continued)
- 126/376: Handle compound single dash options properly, Ludovic Courtès, 2015/01/28
- 124/376: Fix warning about non-existant -I directories, Ludovic Courtès, 2015/01/28
- 127/376: Use regular file GC roots if possible, Ludovic Courtès, 2015/01/28
- 128/376: nix-log2xml: Handle UTF-8 characters, Ludovic Courtès, 2015/01/28
- 132/376: nix-shell: Use $XDG_RUNTIME_DIR, Ludovic Courtès, 2015/01/28
- 120/376: download-from-binary-cache.pl: Respect $SSL_CERT_FILE, Ludovic Courtès, 2015/01/28
- 123/376: Remove pointless NIX_LOG_TYPE environment variable, Ludovic Courtès, 2015/01/28
- 136/376: Propagate remote timeouts properly, Ludovic Courtès, 2015/01/28
- 131/376: Use $XDG_RUNTIME_DIR for temporary files, Ludovic Courtès, 2015/01/28
- 137/376: Reduce verbosity, Ludovic Courtès, 2015/01/28
- 133/376: Fix download-via-ssh,
Ludovic Courtès <=
- 130/376: nix-log2xml: Handle newlines, Ludovic Courtès, 2015/01/28
- 143/376: nix-store -l: Automatically pipe output into $PAGER, Ludovic Courtès, 2015/01/28
- 139/376: Fix --attr parsing, Ludovic Courtès, 2015/01/28
- 142/376: Reduce test verbosity, Ludovic Courtès, 2015/01/28
- 138/376: Doh, Ludovic Courtès, 2015/01/28
- 135/376: nix-build: Propagate exit status from nix-store -r, Ludovic Courtès, 2015/01/28
- 125/376: Refactor option handling, Ludovic Courtès, 2015/01/28
- 134/376: build-remote.pl: Provide defaults for $NIX_CURRENT_LOAD and $NIX_REMOTE_SYSTEMS, Ludovic Courtès, 2015/01/28
- 141/376: Filter Nix-specific ANSI escape sequences from stderr, Ludovic Courtès, 2015/01/28
- 140/376: Make hook shutdown more reliable, Ludovic Courtès, 2015/01/28