Hopefully really fix the OpenSSH/GnuPG agent assertion.
svn path=/nixos/trunk/; revision=18516
This commit is contained in:
parent
ab3332a2eb
commit
d912b510f5
|
@ -342,9 +342,9 @@ in
|
|||
|
||||
{ assertion = if cfg.startOpenSSHAgent
|
||||
then !cfg.startGnuPGAgent
|
||||
else (if cfg.startGnuPGAgent
|
||||
else if cfg.startGnuPGAgent
|
||||
then !cfg.startOpenSSHAgent
|
||||
else true);
|
||||
else true;
|
||||
message =
|
||||
"The OpenSSH agent and GnuPG agent cannot be started both. "
|
||||
"Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
|
||||
|
|
Loading…
Reference in New Issue