From 338bb7d3b88ef39b1504a624323f1cf4098c5fc8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Oct 2013 12:59:20 -0400 Subject: [PATCH] fix build fail with old yesod (or something) Avoid MonadIO constraint by using liftAnnex to get to liftIO. --- Assistant/WebApp/Gpg.hs | 4 ++-- .../build_fails_in_Assistant__47__WebApp__47__Gpg.hs.mdwn | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Assistant/WebApp/Gpg.hs b/Assistant/WebApp/Gpg.hs index 0456ec56c4..f5b60345af 100644 --- a/Assistant/WebApp/Gpg.hs +++ b/Assistant/WebApp/Gpg.hs @@ -85,9 +85,9 @@ getGCryptRemoteName u repoloc = do - Since the probing requires gcrypt to be installed, a third action must - be provided to run if it's not installed. -} -checkGCryptRepoEncryption :: (Monad m, MonadIO m, LiftAnnex m) => String -> m a -> m a -> m a -> m a +checkGCryptRepoEncryption :: (Monad m, LiftAnnex m) => String -> m a -> m a -> m a -> m a checkGCryptRepoEncryption location notencrypted notinstalled encrypted = - ifM (liftIO isGcryptInstalled) + ifM (liftAnnex $ liftIO isGcryptInstalled) ( dispatch =<< liftAnnex (inRepo $ Git.GCrypt.probeRepo location) , notinstalled ) diff --git a/doc/bugs/build_fails_in_Assistant__47__WebApp__47__Gpg.hs.mdwn b/doc/bugs/build_fails_in_Assistant__47__WebApp__47__Gpg.hs.mdwn index 40fe501249..172f28143a 100644 --- a/doc/bugs/build_fails_in_Assistant__47__WebApp__47__Gpg.hs.mdwn +++ b/doc/bugs/build_fails_in_Assistant__47__WebApp__47__Gpg.hs.mdwn @@ -53,3 +53,5 @@ Assistant/WebApp/Gpg.hs:88:40: # End of transcript or log. """]] + +> [[fixed|done]] --[[Joey]]