aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
authorJade Lovelace <lix@jade.fyi>2024-04-07 22:34:24 -0700
committerJade Lovelace <lix@jade.fyi>2024-04-08 15:40:12 -0700
commit54bc1f1b9864ca2d784a03f239b7234c6956f929 (patch)
treea3486d8d9dfc1333ffbdf58b1be63f7243ba8201 /src/nix
parent0d37b99a155a82ea629ffc533c8f33250f6a4dd9 (diff)
"but doctor, I AM the untrusted store": nix doctor had wrong trustedness
This probably snuck in in a refactor using truthiness or so. The trustedness flag was having the optional fullness checked, rather than the actual contained trust level. Also adds some tests. ``` m1@6876551b-255d-4cb0-af02-8a4f17b27e2e ~ % nix store ping warning: 'nix store ping' is a deprecated alias for 'nix store info' Store URL: daemon Version: 2.20.4 Trusted: 0 m1@6876551b-255d-4cb0-af02-8a4f17b27e2e ~ % nix doctor warning: 'doctor' is a deprecated alias for 'config check' [PASS] PATH contains only one nix version. [PASS] All profiles are gcroots. [PASS] Client protocol matches store protocol. [INFO] You are trusted by store uri: daemon ``` Fixes: https://git.lix.systems/lix-project/lix/issues/232 Change-Id: I21576e2a0a755036edf8814133345987617ba3d0
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/doctor.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nix/doctor.cc b/src/nix/doctor.cc
index 531f0ad86..da7a1d7a0 100644
--- a/src/nix/doctor.cc
+++ b/src/nix/doctor.cc
@@ -146,10 +146,9 @@ struct CmdDoctor : StoreCommand
void checkTrustedUser(ref<Store> store)
{
- std::string_view trusted = store->isTrustedClient()
- ? "trusted"
- : "not trusted";
- checkInfo(fmt("You are %s by store uri: %s", trusted, store->getUri()));
+ 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()));
}
};