diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-03-21 23:41:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-03-22 17:32:47 -0400 |
| commit | 4eb51126819fe01a003688267f481c6d8014ef47 (patch) | |
| tree | 40f88312d53da654b65a7ed25617e5bdbd6be03c /Annex | |
| parent | 52b90e5d4c2a22415d48a8e572eab328dfcc4407 (diff) | |
rationalize getConfig
getConfig got a remote-specific config, and this confusing name caused it
to be used a couple of places that only were interested in global configs.
Rename to getRemoteConfig and make getConfig only get global configs.
There are no behavior changes here, but remote.<name>.annex-web-options
never actually worked (and per-remote web options is a very unlikely to be
useful case so I didn't make it work), so fix the documentation for it.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Content.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 1794fb5d9..e0cfa7227 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -313,8 +313,7 @@ saveState oneshot = do {- Downloads content from any of a list of urls. -} downloadUrl :: [Url.URLString] -> FilePath -> Annex Bool downloadUrl urls file = do - g <- gitRepo - o <- map Param . words <$> getConfig g "web-options" "" + o <- map Param . words <$> getConfig "annex.web-options" "" liftIO $ anyM (\u -> Url.download u o file) urls {- Copies a key's content, when present, to a temp file. |