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

libfetchers: fix URL logging

Browse source 
8c06b7b43¹ made libfetchers log the URL being fetched just before the
actual fetch, particularly in case something freezes. This used the base
URL, to not include query parameters, as the Nixpkgs lib tests assume
that stderr logs will be equal across shallow and non-shallow git
fetches (and shallow fetches have the ?shallow=1 query parameter).

8c06b7b43 assumed that the `base` field of ParsedURL would be populated,
as the comment simply says "URL without query/fragment"... but
apparently it is not populated when the URL being fetched is *already*
fetched, which caused libfetchers to log things like

fetching gitlab input ''

which is. silly. but you know, busted lix be busted.

Anyway, with this commit we just remove the query params before printing
instead, which seems to do the right thing

[1]: 8c06b7b431

Change-Id: I9b9988992029aa6abef786f20b66e68c2ebb97d4
This commit is contained in:
Qyriad 2024-05-25 19:37:38 -06:00
parent dd53bce476
commit ebd00b2d0b
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) {