Merge branch 'nix-2.22' into nix-2.23
This commit is contained in:
commit
8515cb183e
@ -171,7 +171,7 @@ void State::parseMachines(const std::string & contents)
|
|||||||
std::move(mandatoryFeatures),
|
std::move(mandatoryFeatures),
|
||||||
// `sshPublicHostKey`
|
// `sshPublicHostKey`
|
||||||
tokens[7] != "" && tokens[7] != "-"
|
tokens[7] != "" && tokens[7] != "-"
|
||||||
? base64Decode(tokens[7])
|
? tokens[7]
|
||||||
: "",
|
: "",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user