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 /Remote/Bup.hs | |
| 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 'Remote/Bup.hs')
| -rw-r--r-- | Remote/Bup.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 4ac91e945..54aff7505 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -35,7 +35,7 @@ remote = RemoteType { gen :: Git.Repo -> UUID -> Maybe RemoteConfig -> Annex Remote gen r u c = do - buprepo <- getConfig r "buprepo" (error "missing buprepo") + buprepo <- getRemoteConfig r "buprepo" (error "missing buprepo") cst <- remoteCost r (if bupLocal buprepo then semiCheapRemoteCost else expensiveRemoteCost) bupr <- liftIO $ bup2GitRemote buprepo (u', bupr') <- getBupUUID bupr u @@ -99,7 +99,7 @@ pipeBup params inh outh = do bupSplitParams :: Git.Repo -> BupRepo -> Key -> CommandParam -> Annex [CommandParam] bupSplitParams r buprepo k src = do - o <- getConfig r "bup-split-options" "" + o <- getRemoteConfig r "bup-split-options" "" let os = map Param $ words o showOutput -- make way for bup output return $ bupParams "split" buprepo |