From f7d8982672fd330a466c2cb22f34388e7cc429c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 May 2012 20:15:32 -0400 Subject: 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. --- Remote/Hook.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Remote') diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 1c87823ca..dcac9da88 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -74,14 +74,14 @@ hookEnv k f = Just $ fileenv f ++ keyenv lookupHook :: String -> String -> Annex (Maybe String) lookupHook hooktype hook =do - command <- getConfig hookname "" + command <- getConfig (annexConfig hookname) "" if null command then do warning $ "missing configuration for " ++ hookname return Nothing else return $ Just command where - hookname = "annex." ++ hooktype ++ "-" ++ hook ++ "-hook" + hookname = 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 -- cgit v1.2.3