From b7a9da96be054b8de808b5370d747fd6463e792d Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 26 Jul 2025 01:12:37 +0200 Subject: [PATCH] libstore/worker: `pathContentsGood` inform about physical store locations When a user runs a repair or check sequence, they might be confused of seeing references to a logical /nix/store path rather than the actual physical store location. Change-Id: I042031a6159cdd1054e7e200a220bf6c321d5fb8 Signed-off-by: Raito Bezarius --- lix/libstore/build/worker.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lix/libstore/build/worker.cc b/lix/libstore/build/worker.cc index 7d40a818f..786919912 100644 --- a/lix/libstore/build/worker.cc +++ b/lix/libstore/build/worker.cc @@ -386,7 +386,7 @@ kj::Promise> Worker::pathContentsGood(const StorePath & path) try { auto i = pathContentsGoodCache.find(path); if (i != pathContentsGoodCache.end()) co_return i->second; - printInfo("checking path '%s'...", store.printStorePath(path)); + printInfo("checking path '%s'...", store.toRealPath(store.printStorePath(path))); auto info = TRY_AWAIT(store.queryPathInfo(path)); bool res; if (!pathExists(store.printStorePath(path))) @@ -398,7 +398,9 @@ try { } pathContentsGoodCache.insert_or_assign(path, res); if (!res) - printError("path '%s' is corrupted or missing!", store.printStorePath(path)); + printError( + "path '%s' is corrupted or missing!", store.toRealPath(store.printStorePath(path)) + ); co_return res; } catch (...) { co_return result::current_exception();