lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

libfetchers: log fetches by URL just before they happen

Browse source 
Addresses but does not close #305, as we still need an indicator for
frozen fetches.

Change-Id: Iba34ad42dc1c8772f7da249b90fe794b041bbf73
This commit is contained in:
Qyriad 2024-05-23 22:48:36 -06:00
parent adfc22c3e3
commit 8c06b7b431
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libfetchers/fetchers.cc
View file

@ -133,6 +133,10 @@ 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
// 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);
try { try {
return scheme->fetch(store, *this); return scheme->fetch(store, *this);
} catch (Error & e) { } catch (Error & e) {

1
tests/functional/nix-profile.sh
View file

@ -155,6 +155,7 @@ diff -u <(
nix --offline profile install $flake2Dir 2>&1 1> /dev/null \ nix --offline profile install $flake2Dir 2>&1 1> /dev/null \
| grep -vE "^warning: " \ | grep -vE "^warning: " \
| grep -vE "^error \(ignored\): " \ | grep -vE "^error \(ignored\): " \
| grep -vE "^fetching .+ input" \
|| true || true
) <(cat << EOF ) <(cat << EOF
error: An existing package already provides the following file: error: An existing package already provides the following file: