diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-16 11:52:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-16 11:52:48 -0400 |
| commit | 746fd6cca86f65a8524bae300072c5205ba637b8 (patch) | |
| tree | 81c851b4730cd037d5aeb3c654e22ff5f654821b /Annex | |
| parent | 58cc9bdb24e87b9073c0154f4dfd5230fc48e519 (diff) | |
fix android build, broken by changes for windows port
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Branch.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index 9a89a65c3..2cba28901 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -294,8 +294,7 @@ withIndex' bootstrapping a = do - Use getEnv to get some key environment variables that - git expects to have. -} let keyenv = words "USER PATH GIT_EXEC_PATH HOSTNAME HOME" - let getEnvPair k = maybe Nothing (\v -> Just (k, v)) <$> - catchMaybeIO (getEnv k) + let getEnvPair k = maybe Nothing (\v -> Just (k, v)) <$> getEnv k e <- liftIO $ catMaybes <$> forM keyenv getEnvPair #else e <- liftIO getEnvironment |