From 57695d8f7630581c53ab37fe4123f92a3b1f426e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Aug 2014 22:46:35 +0200 Subject: [PATCH] Warn about untrusted binary caches in extra-binary-caches --- scripts/download-from-binary-cache.pl.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in index a3af75f73..49f829b68 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’ [@trustedUrls] 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; }