guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Report substituter errors to clients of the Nix daemon

Browse Source
This commit is contained in:
Eelco Dolstra
2012-08-01 11:19:24 -04:00
parent 4d1b64f118
commit c770a2422a
5 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/download-from-binary-cache.pl.in
+3 -7
View File
@@ -184,13 +184,9 @@ sub getAvailableCaches {
my @trustedUrls = (@urls, strToList($Nix::Config::config{"trusted-binary-caches"} // ""));
@urls = ();
foreach my $url (@untrustedUrls) {
if (any { $url eq $_ } @trustedUrls) {
push @urls, $url;
} else {
# FIXME: should die here, but we currently can't
# deliver error messages to clients.
warn "warning: binary cache ‘$url’ is not trusted (please add it to ‘trusted-binary-caches’ 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 any { $url eq $_ } @trustedUrls;
push @urls, $url;
}
}