mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-13 17:23:08 +00:00
Fix the OpenSSH/GnuPG agent assertion.
svn path=/nixos/trunk/; revision=18514
This commit is contained in:
parent
66d8af6d09
commit
8c349a9e71
@ -340,11 +340,14 @@ in
|
||||
message = "The X server needs HAL running. Set services.hal.enable to true";
|
||||
}
|
||||
|
||||
{ assertion = (cfg.startSSHAgent -> !cfg.startGnuPGAgent)
|
||||
&& (cfg.startGnuPGAgent -> !cfg.startSSHAgent);
|
||||
{ assertion = if cfg.startSSHAgent
|
||||
then !cfg.startGnuPGAgent
|
||||
else (if cfg.startGnuPGAgent
|
||||
then !cfg.startSSHAgent
|
||||
else true);
|
||||
message =
|
||||
"The OpenSSH SSH agent and GnuPG agent cannot be started " +
|
||||
"both. Choose between `startSSHAgent' and `startGnuPGAgent'.";
|
||||
"The OpenSSH agent and GnuPG agent cannot be started both. "
|
||||
"Choose between `startSSHAgent' and `startGnuPGAgent'.";
|
||||
}
|
||||
];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user