summaryrefslogtreecommitdiff
path: root/Remote/Directory.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-03-21 23:41:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-03-22 17:32:47 -0400
commit4eb51126819fe01a003688267f481c6d8014ef47 (patch)
tree40f88312d53da654b65a7ed25617e5bdbd6be03c /Remote/Directory.hs
parent52b90e5d4c2a22415d48a8e572eab328dfcc4407 (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 'Remote/Directory.hs')
-rw-r--r--Remote/Directory.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index ecbf511d6..3627d9a9a 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -33,7 +33,7 @@ remote = RemoteType {
gen :: Git.Repo -> UUID -> Maybe RemoteConfig -> Annex Remote
gen r u c = do
- dir <- getConfig r "directory" (error "missing directory")
+ dir <- getRemoteConfig r "directory" (error "missing directory")
cst <- remoteCost r cheapRemoteCost
let chunksize = chunkSize c
return $ encryptableRemote c