mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix windows build

Browse source
This commit is contained in:
Joey Hess 2014-05-14 15:50:58 -04:00
parent 85e9e8c0cf
commit 740de08461
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Configurators/Ssh.hs
View file

@ -606,7 +606,7 @@ prepRsyncNet sshinput reponame a = do
, Param $ sshhost ++ ":.ssh/" , Param $ sshhost ++ ":.ssh/"
] ]
let remotecommand = "mkdir -p " ++ T.unpack (sshDirectory sshdata) let remotecommand = "mkdir -p " ++ T.unpack (sshDirectory sshdata)
sshSetup ssinput (torsyncnet remotecommand) Nothing (a sshdata) sshSetup sshinput (torsyncnet remotecommand) Nothing (a sshdata)
#endif #endif
isRsyncNet :: Maybe Text -> Bool isRsyncNet :: Maybe Text -> Bool

2
Utility/Daemon.hs
View file

@ -54,7 +54,6 @@ daemonize logfd pidfile changedirectory a = do
wait =<< asyncWithUnmask (\unmask -> unmask a) wait =<< asyncWithUnmask (\unmask -> unmask a)
out out
out = exitImmediately ExitSuccess out = exitImmediately ExitSuccess
#endif
{- To run an action that is normally daemonized in the forground. -} {- To run an action that is normally daemonized in the forground. -}
foreground :: Fd -> Maybe FilePath -> IO () -> IO () foreground :: Fd -> Maybe FilePath -> IO () -> IO ()
@ -64,6 +63,7 @@ foreground logfd pidfile a = do
redirLog logfd redirLog logfd
a a
exitImmediately ExitSuccess exitImmediately ExitSuccess
#endif
{- Locks the pid file, with an exclusive, non-blocking lock, {- Locks the pid file, with an exclusive, non-blocking lock,
- and leaves it locked on return. - and leaves it locked on return.