cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge "libfetchers: fix URL logging" into main

Browse source
This commit is contained in:
Qyriad 2024-05-27 14:20:15 +00:00 committed by Gerrit Code Review
commit 2cd1ef2201
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libfetchers/fetchers.cc
View file

@ -133,10 +133,12 @@ std::pair<Tree, Input> Input::fetch(ref<Store> store) const
} }
auto [storePath, input] = [&]() -> std::pair<StorePath, Input> { auto [storePath, input] = [&]() -> std::pair<StorePath, Input> {
// *sighs*, we print the base URL, rather than the full URL because the Nixpkgs // *sighs*, we print the URL without query params, rather than the full URL
// fileset lib tests assume that fetching shallow and non-shallow prints exactly the // because the Nixpkgs fileset lib tests assume that fetching shallow and
// same stderr... // non-shallow prints exactly the same stderr...
printInfo("fetching %s input '%s'", this->getType(), this->toURL().base); ParsedURL withoutParams = this->toURL();
withoutParams.query.clear();
printInfo("fetching %s input '%s'", this->getType(), withoutParams.to_string());
try { try {
return scheme->fetch(store, *this); return scheme->fetch(store, *this);
} catch (Error & e) { } catch (Error & e) {