philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #4318 from matthewbauer/add-slash-to-trusted-binary-cache

Browse source 
Canonicalize binary caches with ‘/’ when one is missing
This commit is contained in:
Eelco Dolstra 2020-12-05 10:17:17 +01:00 committed by GitHub
parent a5d85d07fa b9a00fd15b
commit 1d1a85eb0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/daemon.cc
View file

@ -215,6 +215,8 @@ struct ClientSettings
for (auto & s : ss) for (auto & s : ss)
if (trusted.count(s)) if (trusted.count(s))
subs.push_back(s); subs.push_back(s);
else if (!hasSuffix(s, "/") && trusted.count(s + "/"))
subs.push_back(s + "/");
else else
warn("ignoring untrusted substituter '%s'", s); warn("ignoring untrusted substituter '%s'", s);
res = subs; res = subs;