From 740de0846148a7f1e8c581954d1143d098d1eae2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 14 May 2014 15:50:58 -0400 Subject: [PATCH] fix windows build --- Assistant/WebApp/Configurators/Ssh.hs | 2 +- Utility/Daemon.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assistant/WebApp/Configurators/Ssh.hs b/Assistant/WebApp/Configurators/Ssh.hs index e07fdbc953..32d08ca2af 100644 --- a/Assistant/WebApp/Configurators/Ssh.hs +++ b/Assistant/WebApp/Configurators/Ssh.hs @@ -606,7 +606,7 @@ prepRsyncNet sshinput reponame a = do , Param $ sshhost ++ ":.ssh/" ] let remotecommand = "mkdir -p " ++ T.unpack (sshDirectory sshdata) - sshSetup ssinput (torsyncnet remotecommand) Nothing (a sshdata) + sshSetup sshinput (torsyncnet remotecommand) Nothing (a sshdata) #endif isRsyncNet :: Maybe Text -> Bool diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs index 2a2e0e08a5..e715ecbe7c 100644 --- a/Utility/Daemon.hs +++ b/Utility/Daemon.hs @@ -54,7 +54,6 @@ daemonize logfd pidfile changedirectory a = do wait =<< asyncWithUnmask (\unmask -> unmask a) out out = exitImmediately ExitSuccess -#endif {- To run an action that is normally daemonized in the forground. -} foreground :: Fd -> Maybe FilePath -> IO () -> IO () @@ -64,6 +63,7 @@ foreground logfd pidfile a = do redirLog logfd a exitImmediately ExitSuccess +#endif {- Locks the pid file, with an exclusive, non-blocking lock, - and leaves it locked on return.