nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-25 16:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve the config check output for stores that don't know about trust

Browse Source 
Make it proper english
This commit is contained in:
Théophane Hufschmitt 2024-04-08 11:02:39 +02:00
parent dea23c3c9b
commit bd8c276ddb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nix/config-check.cc
View File

@ -145,9 +145,14 @@ struct CmdConfigCheck : StoreCommand
void checkTrustedUser(ref<Store> store)
{
auto trustedMay = store->isTrustedClient();
std::string_view trustedness = trustedMay ? (*trustedMay ? "trusted" : "not trusted") : "unknown trust";
checkInfo(fmt("You are %s by store uri: %s", trustedness, store->getUri()));
if (auto trustedMay = store->isTrustedClient()) {
std::string_view trusted = trustedMay.value()
? "trusted"
: "not trusted";
checkInfo(fmt("You are %s by store uri: %s", trusted, store->getUri()));
} else {
checkInfo(fmt("Store uri: %s doesn't have a notion of trusted user", store->getUri()));
}
}
};

2
tests/functional/legacy-ssh-store.sh
View File

@ -6,4 +6,4 @@ store_uri="ssh://localhost?remote-store=$TEST_ROOT/other-store"
nix --store "$store_uri" store info --json | jq -e 'has("trusted") | not'
# Suppress grumpiness about multiple nixes on PATH
(nix --store "$store_uri" doctor || true) 2>&1 | grep 'You are unknown trust'
(nix --store "$store_uri" doctor || true) 2>&1 | grep "doesn't have a notion of trusted user"