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

Merge pull request #6072 from Ma27/fix-nix-why-depends-non-precise

Browse source 
nix/why-depends: fix output when not using `--precise`
This commit is contained in:
Théophane Hufschmitt 2022-02-28 11:46:50 +01:00 committed by GitHub
parent e85d565b5a 5b586575ac
commit c2720797d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/nix/why-depends.cc
View file

@ -171,12 +171,6 @@ struct CmdWhyDepends : SourceExprCommand
node.visited ? "\e[38;5;244m" : "", node.visited ? "\e[38;5;244m" : "",
firstPad != "" ? "→ " : "", firstPad != "" ? "→ " : "",
pathS); pathS);
} else {
logger->cout("%s%s%s%s" ANSI_NORMAL,
firstPad,
node.visited ? "\e[38;5;244m" : "",
firstPad != "" ? treeLast : "",
pathS);
} }
if (node.path == dependencyPath && !all if (node.path == dependencyPath && !all
@ -184,7 +178,7 @@ struct CmdWhyDepends : SourceExprCommand
throw BailOut(); throw BailOut();
if (node.visited) return; if (node.visited) return;
node.visited = true; if (precise) node.visited = true;
/* Sort the references by distance to `dependency` to /* Sort the references by distance to `dependency` to
ensure that the shortest path is printed first. */ ensure that the shortest path is printed first. */
@ -267,6 +261,16 @@ struct CmdWhyDepends : SourceExprCommand
if (!all) break; if (!all) break;
} }
if (!precise) {
auto pathS = store->printStorePath(ref.second->path);
logger->cout("%s%s%s%s" ANSI_NORMAL,
firstPad,
ref.second->visited ? "\e[38;5;244m" : "",
last ? treeLast : treeConn,
pathS);
node.visited = true;
}
printNode(*ref.second, printNode(*ref.second,
tailPad + (last ? treeNull : treeLine), tailPad + (last ? treeNull : treeLine),
tailPad + (last ? treeNull : treeLine)); tailPad + (last ? treeNull : treeLine));
@ -275,6 +279,9 @@ struct CmdWhyDepends : SourceExprCommand
RunPager pager; RunPager pager;
try { try {
if (!precise) {
logger->cout("%s", store->printStorePath(graph.at(packagePath).path));
}
printNode(graph.at(packagePath), "", ""); printNode(graph.at(packagePath), "", "");
} catch (BailOut & ) { } } catch (BailOut & ) { }
} }