From f7d8982672fd330a466c2cb22f34388e7cc429c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 May 2012 20:15:32 -0400 Subject: Fix use of several config settings annex.ssh-options, annex.rsync-options, annex.bup-split-options. And adjust types to avoid the bugs that broke several config settings recently. Now "annex." prefixing is enforced at the type level. --- Annex/Content.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Annex/Content.hs') diff --git a/Annex/Content.hs b/Annex/Content.hs index b5754e15b..2142d1f09 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -304,12 +304,12 @@ saveState oneshot = doSideAction $ do ( Annex.Branch.commit "update" , Annex.Branch.stage) where alwayscommit = fromMaybe True . Git.configTrue - <$> getConfig "annex.alwayscommit" "" + <$> getConfig (annexConfig "alwayscommit") "" {- Downloads content from any of a list of urls. -} downloadUrl :: [Url.URLString] -> FilePath -> Annex Bool downloadUrl urls file = do - o <- map Param . words <$> getConfig "annex.web-options" "" + o <- map Param . words <$> getConfig (annexConfig "web-options") "" headers <- getHttpHeaders liftIO $ anyM (\u -> Url.download u headers o file) urls -- cgit v1.2.3