diff options
| author | Qyriad <qyriad@qyriad.me> | 2024-05-27 14:20:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix-systems> | 2024-05-27 14:20:15 +0000 |
| commit | 2cd1ef2201cd046cbf041b52040c6e86efd927d8 (patch) | |
| tree | 7f1c30a1b8d97a48ea6a631606b7c0205871b27b | |
| parent | ec5039653d6281f8bbe6158758aa721a1061082a (diff) | |
| parent | ebd00b2d0b7a9cc753acc6de9572ac112a3492a7 (diff) | |
Merge "libfetchers: fix URL logging" into main
| -rw-r--r-- | src/libfetchers/fetchers.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc index 210912cb6..e09513d8f 100644 --- a/src/libfetchers/fetchers.cc +++ b/src/libfetchers/fetchers.cc @@ -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) { |