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

fix build fail with old yesod (or something)

Browse source 
Avoid MonadIO constraint by using liftAnnex to get to liftIO.
This commit is contained in:
Joey Hess 2013-10-24 12:59:20 -04:00
commit 338bb7d3b8
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/WebApp/Gpg.hs
View file

@ -85,9 +85,9 @@ getGCryptRemoteName u repoloc = do
- Since the probing requires gcrypt to be installed, a third action must - Since the probing requires gcrypt to be installed, a third action must
- be provided to run if it's not installed. - 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 = checkGCryptRepoEncryption location notencrypted notinstalled encrypted =
ifM (liftIO isGcryptInstalled) ifM (liftAnnex $ liftIO isGcryptInstalled)
( dispatch =<< liftAnnex (inRepo $ Git.GCrypt.probeRepo location) ( dispatch =<< liftAnnex (inRepo $ Git.GCrypt.probeRepo location)
, notinstalled , notinstalled
) )

2
doc/bugs/build_fails_in_Assistant__47__WebApp__47__Gpg.hs.mdwn
View file

@ -53,3 +53,5 @@ Assistant/WebApp/Gpg.hs:88:40:
# End of transcript or log. # End of transcript or log.
"""]] """]]
> [[fixed|done]] --[[Joey]]