guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix-store: don't print to stdout from printTree

Browse Source 
print into a provided stream instead.

Change-Id: I52495154163e40d05b6897aa129eb9b3d81348dc
This commit is contained in:
eldritch horrors
2026-01-18 19:17:04 +00:00
parent 98cb3014e8
commit 3194e3b6f4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/legacy/nix-store.cc
+5 -3
View File
@@ -288,6 +288,7 @@ try {
graph. Topological sorting is used to keep the tree relatively
flat. */
static void printTree(
std::ostream & ostream,
std::shared_ptr<Store> store,
AsyncIoRoot & aio,
const StorePath & path,
@@ -297,11 +298,11 @@ static void printTree(
)
{
if (!done.insert(path).second) {
cout << fmt("%s%s [...]\n", firstPad, store->printStorePath(path));
ostream << fmt("%s%s [...]\n", firstPad, store->printStorePath(path));
return;
}
cout << fmt("%s%s\n", firstPad, store->printStorePath(path));
ostream << fmt("%s%s\n", firstPad, store->printStorePath(path));
auto info = aio.blockOn(store->queryPathInfo(path));
@@ -315,6 +316,7 @@ static void printTree(
for (const auto &[n, i] : enumerate(sorted)) {
bool last = n + 1 == sorted.size();
printTree(
ostream,
store,
aio,
i,
@@ -477,7 +479,7 @@ opQuery(std::shared_ptr<Store> store, AsyncIoRoot & aio, Strings opFlags, String
case qTree: {
StorePathSet done;
for (auto & i : opArgs)
printTree(store, aio, store->followLinksToStorePath(i), "", "", done);
printTree(std::cout, store, aio, store->followLinksToStorePath(i), "", "", done);
break;
}