Merge changes I3ab84cc5,Iba34ad42 into main
* changes: nix3: always use the same verbosity default (info) libfetchers: log fetches by URL just before they happen
This commit is contained in:
commit
1c0f3c540e
3 changed files with 5 additions and 5 deletions
|
@ -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) {
|
||||||
|
|
|
@ -363,11 +363,6 @@ void mainWrapped(int argc, char * * argv)
|
||||||
|
|
||||||
setLogFormat("bar");
|
setLogFormat("bar");
|
||||||
settings.verboseBuild = false;
|
settings.verboseBuild = false;
|
||||||
if (isatty(STDERR_FILENO)) {
|
|
||||||
verbosity = lvlNotice;
|
|
||||||
} else {
|
|
||||||
verbosity = lvlInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
NixArgs args;
|
NixArgs args;
|
||||||
|
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in a new issue