guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

255/376: binary download: Use $NIX_CURL_FLAGS


From: Ludovic Courtès
Subject: 255/376: binary download: Use $NIX_CURL_FLAGS
Date: Wed, 28 Jan 2015 22:05:26 +0000

civodul pushed a commit to tag 1.8
in repository guix.

commit bc4795919afac59af8f27d3c1f26ab404330f718
Author: wmertens <address@hidden>
Date:   Tue Oct 14 15:36:14 2014 +0200

    binary download: Use $NIX_CURL_FLAGS
    
    As in 
https://github.com/NixOS/nixpkgs/blob/5c0816567d6b99bd2ef7c8ae5744f80a6a0372c4/pkgs/build-support/fetchurl/builder.sh#L17
---
 scripts/download-from-binary-cache.pl.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/download-from-binary-cache.pl.in 
b/scripts/download-from-binary-cache.pl.in
index cdce8eb..27c4895 100644
--- a/scripts/download-from-binary-cache.pl.in
+++ b/scripts/download-from-binary-cache.pl.in
@@ -546,7 +546,7 @@ sub downloadBinary {
         die if $requireSignedBinaryCaches && !defined $info->{signedBy};
         print STDERR "\n*** Downloading ‘$url’ ", ($requireSignedBinaryCaches 
? "(signed by ‘$info->{signedBy}’) " : ""), "to ‘$storePath’...\n";
         checkURL $url;
-        if (system("$Nix::Config::curl --fail --location --insecure 
--connect-timeout $curlConnectTimeout '$url' $decompressor | 
$Nix::Config::binDir/nix-store --restore $destPath") != 0) {
+        if (system("$Nix::Config::curl --fail --location --insecure 
--connect-timeout $curlConnectTimeout $NIX_CURL_FLAGS '$url' $decompressor | 
$Nix::Config::binDir/nix-store --restore $destPath") != 0) {
             warn "download of ‘$url’ failed" . ($! ? ": $!" : "") . "\n";
             next;
         }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]