122/376: Warn about untrusted binary caches in extra-binary-caches

[Ludovic Courtès]

civodul pushed a commit to tag 1.8
in repository guix.

commit 57695d8f7630581c53ab37fe4123f92a3b1f426e
Author: Eelco Dolstra <address@hidden>
Date:   Thu Aug 7 22:46:35 2014 +0200

    Warn about untrusted binary caches in extra-binary-caches
---
 scripts/download-from-binary-cache.pl.in |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/download-from-binary-cache.pl.in 
b/scripts/download-from-binary-cache.pl.in
index a3af75f..49f829b 100644
--- a/scripts/download-from-binary-cache.pl.in
+++ b/scripts/download-from-binary-cache.pl.in
@@ -237,7 +237,7 @@ sub getAvailableCaches {
         my @untrustedUrls = strToList 
$Nix::Config::config{"untrusted-binary-caches"};
         @urls = ();
         foreach my $url (@untrustedUrls) {
-            die "binary cache ‘$url’ is not trusted (please add it to 
‘trusted-binary-caches’ address@hidden in $Nix::Config::confDir/nix.conf)\n"
+            die "binary cache ‘$url’ is not trusted (please add it to 
‘trusted-binary-caches’ in $Nix::Config::confDir/nix.conf)\n"
                 unless scalar(grep { $url eq $_ } @trustedUrls) > 0;
             push @urls, $url;
         }
@@ -245,7 +245,10 @@ sub getAvailableCaches {
 
     my @untrustedUrls = strToList 
$Nix::Config::config{"untrusted-extra-binary-caches"} // "";
     foreach my $url (@untrustedUrls) {
-        next unless scalar(grep { $url eq $_ } @trustedUrls) > 0;
+        unless (scalar(grep { $url eq $_ } @trustedUrls) > 0) {
+            warn "binary cache ‘$url’ is not trusted (please add it to 
‘trusted-binary-caches’ in $Nix::Config::confDir/nix.conf)\n";
+            next;
+        }
         push @urls, $url;
     }