fabianhjr/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix doctor: only perform path/profile checks with a daemon/local store

Browse source 
Not all store types LegacySSHStore support these operations and it
doesn't really make sense to check those.
This commit is contained in:
Daiderd Jordan 2018-09-02 13:14:39 +02:00
parent bfdca55868
commit 80a4b44d3d
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nix/doctor.cc
View file

@ -33,8 +33,12 @@ struct CmdDoctor : StoreCommand
std::cout << "Store uri: " << store->getUri() << std::endl; std::cout << "Store uri: " << store->getUri() << std::endl;
std::cout << std::endl; std::cout << std::endl;
checkNixInPath(); auto type = getStoreType();
checkProfileRoots(store);
if (type < tOther) {
checkNixInPath();
checkProfileRoots(store);
}
checkStoreProtocol(store->getProtocol()); checkStoreProtocol(store->getProtocol());
} }
@ -56,7 +60,6 @@ struct CmdDoctor : StoreCommand
void checkProfileRoots(ref<Store> store) { void checkProfileRoots(ref<Store> store) {
PathSet dirs; PathSet dirs;
Roots roots = store->findRoots(); Roots roots = store->findRoots();
for (auto & dir : tokenizeString<Strings>(getEnv("PATH"), ":")) for (auto & dir : tokenizeString<Strings>(getEnv("PATH"), ":"))