Merge pull request #10427 from lf-/jade/fix-nix-doctor

"but doctor, I AM the untrusted store": nix doctor had wrong trustedness

src/nix/config-check.cc

@@ -145,10 +145,14 @@ struct CmdConfigCheck : 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()));
+        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()));
+        }
     }
 };
 

tests/functional/legacy-ssh-store.sh

@@ -1,4 +1,9 @@
 source common.sh
 
+store_uri="ssh://localhost?remote-store=$TEST_ROOT/other-store"
+
 # Check that store info trusted doesn't yet work with ssh://
-nix --store ssh://localhost?remote-store=$TEST_ROOT/other-store store info --json | jq -e 'has("trusted") | not'
+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 "doesn't have a notion of trusted user"

tests/functional/remote-store.sh

@@ -13,6 +13,8 @@ startDaemon
 if isDaemonNewer "2.15pre0"; then
     # Ensure that ping works trusted with new daemon
     nix store info --json | jq -e '.trusted'
+    # Suppress grumpiness about multiple nixes on PATH
+    (nix doctor || true) 2>&1 | grep 'You are trusted by'
 else
     # And the the field is absent with the old daemon
     nix store info --json | jq -e 'has("trusted") | not'