diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-10 19:20:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-10 19:20:14 -0400 |
| commit | 899f84a217681833146fadd8f30cd25ed1a9f653 (patch) | |
| tree | 37351958f69f8afef17b96966a30ca2dde79ba1c /Remote/Hook.hs | |
| parent | 465c36e8f6a45b888e8f7be8baa52f0eb1759f77 (diff) | |
export CreateProcess fields from Utility.Process
update code to avoid cwd and env redefinition warnings
Diffstat (limited to 'Remote/Hook.hs')
| -rw-r--r-- | Remote/Hook.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 3735c228c..74641f5aa 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -79,15 +79,15 @@ hookEnv :: Action -> Key -> Maybe FilePath -> IO (Maybe [(String, String)]) hookEnv action k f = Just <$> mergeenv (fileenv f ++ keyenv) where mergeenv l = addEntries l <$> getEnvironment - env s v = ("ANNEX_" ++ s, v) + envvar s v = ("ANNEX_" ++ s, v) keyenv = catMaybes - [ Just $ env "KEY" (key2file k) - , Just $ env "ACTION" action - , env "HASH_1" <$> headMaybe hashbits - , env "HASH_2" <$> headMaybe (drop 1 hashbits) + [ Just $ envvar "KEY" (key2file k) + , Just $ envvar "ACTION" action + , envvar "HASH_1" <$> headMaybe hashbits + , envvar "HASH_2" <$> headMaybe (drop 1 hashbits) ] fileenv Nothing = [] - fileenv (Just file) = [env "FILE" file] + fileenv (Just file) = [envvar "FILE" file] hashbits = map takeDirectory $ splitPath $ hashDirMixed k lookupHook :: HookName -> Action -> Annex (Maybe String) @@ -155,5 +155,5 @@ checkPresent r h k = do findkey s = key2file k `elem` lines s check Nothing = error $ action ++ " hook misconfigured" check (Just hook) = do - env <- hookEnv action k Nothing - findkey <$> readProcessEnv "sh" ["-c", hook] env + environ <- hookEnv action k Nothing + findkey <$> readProcessEnv "sh" ["-c", hook] environ |