From 1966f9d2975856cee902f71300781d3b9eef5af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 22 Nov 2009 00:54:01 +0000 Subject: [PATCH] Hopefully really fix the OpenSSH/GnuPG agent assertion (yes!). svn path=/nixos/trunk/; revision=18517 --- modules/services/x11/xserver.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index baf224975a2..b4554ac5c52 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -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'."; } ];