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/Hook.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/Hook.hs')
| -rw-r--r-- | Remote/Hook.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 1e5c27b91..1c87823ca 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -30,7 +30,7 @@ remote = RemoteType { gen :: Git.Repo -> UUID -> Maybe RemoteConfig -> Annex Remote gen r u c = do - hooktype <- getConfig r "hooktype" (error "missing hooktype") + hooktype <- getRemoteConfig r "hooktype" (error "missing hooktype") cst <- remoteCost r expensiveRemoteCost return $ encryptableRemote c (storeEncrypted hooktype) @@ -74,15 +74,14 @@ hookEnv k f = Just $ fileenv f ++ keyenv lookupHook :: String -> String -> Annex (Maybe String) lookupHook hooktype hook =do - g <- gitRepo - command <- getConfig g hookname "" + command <- getConfig hookname "" if null command then do warning $ "missing configuration for " ++ hookname return Nothing else return $ Just command where - hookname = hooktype ++ "-" ++ hook ++ "-hook" + hookname = "annex." ++ hooktype ++ "-" ++ hook ++ "-hook" runHook :: String -> String -> Key -> Maybe FilePath -> Annex Bool -> Annex Bool runHook hooktype hook k f a = maybe (return False) run =<< lookupHook hooktype hook |