Skip to content

Commit

Permalink
nix path-info: Don't write to std::cout directly
Browse files Browse the repository at this point in the history
This interferes with the progress bar, resulting in output like

  evaluating derivation 'git+file:///home/eelco/Dev/nix-master#packages.x86_64-linux.default'/nix/store/zz8v96j5md952x0mxfix12xqnvq5qv5x-nix-2.26.0pre20241114_a95f6ea.drv

(cherry picked from commit 33a0fa8)
  • Loading branch information
edolstra authored and mergify[bot] committed Nov 15, 2024
1 parent aaeaa4e commit 3bfc35b
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions src/nix/path-info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ struct CmdPathInfo : StorePathsCommand, MixJSON

Category category() override { return catSecondary; }

void printSize(uint64_t value)
void printSize(std::ostream & str, uint64_t value)
{
if (humanReadable)
std::cout << fmt("\t%s", renderSize(value, true));
str << fmt("\t%s", renderSize(value, true));
else
std::cout << fmt("\t%11d", value);
str << fmt("\t%11d", value);
}

void run(ref<Store> store, StorePaths && storePaths) override
Expand All @@ -154,11 +154,11 @@ struct CmdPathInfo : StorePathsCommand, MixJSON
pathLen = std::max(pathLen, store->printStorePath(storePath).size());

if (json) {
std::cout << pathInfoToJSON(
logger->cout(pathInfoToJSON(
*store,
// FIXME: preserve order?
StorePathSet(storePaths.begin(), storePaths.end()),
showClosureSize).dump();
showClosureSize).dump());
}

else {
Expand All @@ -167,30 +167,32 @@ struct CmdPathInfo : StorePathsCommand, MixJSON
auto info = store->queryPathInfo(storePath);
auto storePathS = store->printStorePath(info->path);

std::cout << storePathS;
std::ostringstream str;

str << storePathS;

if (showSize || showClosureSize || showSigs)
std::cout << std::string(std::max(0, (int) pathLen - (int) storePathS.size()), ' ');
str << std::string(std::max(0, (int) pathLen - (int) storePathS.size()), ' ');

if (showSize)
printSize(info->narSize);
printSize(str, info->narSize);

if (showClosureSize) {
StorePathSet closure;
store->computeFSClosure(storePath, closure, false, false);
printSize(getStoreObjectsTotalSize(*store, closure));
printSize(str, getStoreObjectsTotalSize(*store, closure));
}

if (showSigs) {
std::cout << '\t';
str << '\t';
Strings ss;
if (info->ultimate) ss.push_back("ultimate");
if (info->ca) ss.push_back("ca:" + renderContentAddress(*info->ca));
for (auto & sig : info->sigs) ss.push_back(sig);
std::cout << concatStringsSep(" ", ss);
str << concatStringsSep(" ", ss);
}

std::cout << std::endl;
logger->cout(str.str());
}

}
Expand Down

0 comments on commit 3bfc35b

Please sign in to comment.