diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-05-05 20:15:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-05-05 20:16:56 -0400 |
| commit | f7d8982672fd330a466c2cb22f34388e7cc429c0 (patch) | |
| tree | b5739058cc2cb04fa4a119df2cecf449d4846c03 /Annex/Content.hs | |
| parent | 657d09d49990af85c1a91b1154a195a30438477c (diff) | |
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.
Diffstat (limited to 'Annex/Content.hs')
| -rw-r--r-- | Annex/Content.hs | 4 |
1 files changed, 2 insertions, 2 deletions
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 |