fix build fail with old yesod (or something)
Avoid MonadIO constraint by using liftAnnex to get to liftIO.
This commit is contained in:
		
					parent
					
						
							
								14ead32170
							
						
					
				
			
			
				commit
				
					
						338bb7d3b8
					
				
			
		
					 2 changed files with 4 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
		)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,3 +53,5 @@ Assistant/WebApp/Gpg.hs:88:40:
 | 
			
		|||
 | 
			
		||||
# End of transcript or log.
 | 
			
		||||
"""]]
 | 
			
		||||
 | 
			
		||||
> [[fixed|done]] --[[Joey]]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue