public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/services/x11/xserver.nix
View File

@ -342,11 +342,11 @@ in
{ assertion = if cfg.startOpenSSHAgent { assertion = if cfg.startOpenSSHAgent
then !cfg.startGnuPGAgent then !cfg.startGnuPGAgent
else if cfg.startGnuPGAgent else (if cfg.startGnuPGAgent
then !cfg.startOpenSSHAgent then !cfg.startOpenSSHAgent
else true; else true);
message = 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'."; "Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
} }
]; ];