Hopefully really fix the OpenSSH/GnuPG agent assertion (yes!).

svn path=/nixos/trunk/; revision=18517
This commit is contained in:
Ludovic Courtès 2009-11-22 00:54:01 +00:00
parent d912b510f5
commit 1966f9d297

View file

@ -342,11 +342,11 @@ in
{ assertion = if cfg.startOpenSSHAgent
then !cfg.startGnuPGAgent
else if cfg.startGnuPGAgent
then !cfg.startOpenSSHAgent
else true;
else (if cfg.startGnuPGAgent
then !cfg.startOpenSSHAgent
else true);
message =
"The OpenSSH agent and GnuPG agent cannot be started both. "
"The OpenSSH agent and GnuPG agent cannot be started both. " +
"Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
}
];