mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-14 09:43:14 +00:00
Hopefully really fix the OpenSSH/GnuPG agent assertion (yes!).
svn path=/nixos/trunk/; revision=18517
This commit is contained in:
parent
d912b510f5
commit
1966f9d297
@ -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'.";
|
||||
}
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user