Merge "libfetchers: fix URL logging" into main
This commit is contained in:
commit
2cd1ef2201
1 changed files with 6 additions and 4 deletions
|
@ -133,10 +133,12 @@ std::pair<Tree, Input> Input::fetch(ref<Store> store) const
|
|||
}
|
||||
|
||||
auto [storePath, input] = [&]() -> std::pair<StorePath, Input> {
|
||||
// *sighs*, we print the base URL, rather than the full URL because the Nixpkgs
|
||||
// fileset lib tests assume that fetching shallow and non-shallow prints exactly the
|
||||
// same stderr...
|
||||
printInfo("fetching %s input '%s'", this->getType(), this->toURL().base);
|
||||
// *sighs*, we print the URL without query params, rather than the full URL
|
||||
// because the Nixpkgs fileset lib tests assume that fetching shallow and
|
||||
// non-shallow prints exactly the same stderr...
|
||||
ParsedURL withoutParams = this->toURL();
|
||||
withoutParams.query.clear();
|
||||
printInfo("fetching %s input '%s'", this->getType(), withoutParams.to_string());
|
||||
try {
|
||||
return scheme->fetch(store, *this);
|
||||
} catch (Error & e) {
|
||||
|
|
Loading…
Reference in a new issue