summaryrefslogtreecommitdiff
path: root/Config.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-15 18:11:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-15 18:19:36 -0400
commit95d2391f58ae240e7100f0d5488dd7246f71f3bb (patch)
treef33f21904ae7be4d40b70bab1e2a68fd4eef5526 /Config.hs
parentb7e0d39abbc9a09c21c6f0103ad6c9f4547f81fe (diff)
more partial function removal
Left a few Prelude.head's in where it was checked not null and too hard to remove, etc.
Diffstat (limited to 'Config.hs')
-rw-r--r--Config.hs9
1 files changed, 2 insertions, 7 deletions
diff --git a/Config.hs b/Config.hs
index 4cc4c1866..aa8885873 100644
--- a/Config.hs
+++ b/Config.hs
@@ -40,15 +40,10 @@ remoteConfig r key = "remote." ++ fromMaybe "" (Git.remoteName r) ++ ".annex-" +
remoteCost :: Git.Repo -> Int -> Annex Int
remoteCost r def = do
cmd <- getConfig r "cost-command" ""
- safeparse <$> if not $ null cmd
+ (fromMaybe def . readMaybe) <$>
+ if not $ null cmd
then liftIO $ snd <$> pipeFrom "sh" ["-c", cmd]
else getConfig r "cost" ""
- where
- safeparse v
- | null ws = def
- | otherwise = fromMaybe def $ readMaybe $ head ws
- where
- ws = words v
cheapRemoteCost :: Int
cheapRemoteCost = 100