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

rename readMaybe to readish

Browse source 
a stricter (but also partial) readMaybe is getting added to base
This commit is contained in:
Joey Hess 2012-01-23 17:00:10 -04:00
parent 5e172b43c4
commit ba6088b249
9 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Config.hs
View file

@ -40,7 +40,7 @@ remoteConfig r key = "remote." ++ fromMaybe "" (Git.remoteName r) ++ ".annex-" +
remoteCost :: Git.Repo -> Int -> Annex Int
remoteCost r def = do
cmd <- getConfig r "cost-command" ""
(fromMaybe def . readMaybe) <$>
(fromMaybe def . readish) <$>
if not $ null cmd
then liftIO $ snd <$> pipeFrom "sh" ["-c", cmd]
else getConfig r "cost" ""
@ -78,7 +78,7 @@ getNumCopies v = perhaps (use v) =<< Annex.getState Annex.forcenumcopies
where
use (Just n) = return n
use Nothing = perhaps (return 1) =<<
readMaybe <$> fromRepo (Git.Config.get config "1")
readish <$> fromRepo (Git.Config.get config "1")
perhaps fallback = maybe fallback (return . id)
config = "annex.numcopies"