diff --git a/Assistant/WebApp/Configurators/Pairing.hs b/Assistant/WebApp/Configurators/Pairing.hs index d2d63eb114..3dd10c1012 100644 --- a/Assistant/WebApp/Configurators/Pairing.hs +++ b/Assistant/WebApp/Configurators/Pairing.hs @@ -31,10 +31,8 @@ import Network.Protocol.XMPP import Assistant.Types.NetMessager import Assistant.NetMessager import Assistant.WebApp.RepoList -import Assistant.WebApp.Configurators.XMPP -#endif -#if defined(WITH_PAIRING) || defined(WITH_XMP) import Assistant.WebApp.Configurators +import Assistant.WebApp.Configurators.XMPP #endif import Utility.UserInfo import Git diff --git a/Git/Queue.hs b/Git/Queue.hs index 7f8724c8d5..5f7b142c0a 100644 --- a/Git/Queue.hs +++ b/Git/Queue.hs @@ -148,7 +148,7 @@ runAction :: Repo -> Action -> IO () runAction repo (UpdateIndexAction streamers) = -- list is stored in reverse order Git.UpdateIndex.streamUpdateIndex repo $ reverse streamers -runAction repo action@(CommandAction {}) = +runAction repo action@(CommandAction {}) = do #ifndef mingw32_HOST_OS let p = (proc "xargs" $ "-0":"git":toCommand gitparams) { env = gitEnv repo } withHandle StdinHandle createProcessSuccess p $ \h -> do