diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-05-22 15:41:28 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-22 15:41:28 -0400 |
| commit | 14e5429163f0138f03deaaa1134c8b4982c27141 (patch) | |
| tree | 37f8b19e1ee75754e38ebb681af8ddb30f03500d /src/Utility/UserInfo.hs | |
| parent | af00ff05913441cd4860c66aaf1d7a20a55b6d76 (diff) | |
merge Utility from git-annex
Diffstat (limited to 'src/Utility/UserInfo.hs')
| -rw-r--r-- | src/Utility/UserInfo.hs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Utility/UserInfo.hs b/src/Utility/UserInfo.hs index 7e94cafa..c6010116 100644 --- a/src/Utility/UserInfo.hs +++ b/src/Utility/UserInfo.hs @@ -17,9 +17,7 @@ module Utility.UserInfo ( import Utility.Env import System.PosixCompat -#ifndef mingw32_HOST_OS import Control.Applicative -#endif import Prelude {- Current user's home directory. @@ -58,6 +56,6 @@ myVal envvars extract = go envvars #ifndef mingw32_HOST_OS go [] = extract <$> (getUserEntryForID =<< getEffectiveUserID) #else - go [] = error $ "environment not set: " ++ show envvars + go [] = extract <$> error ("environment not set: " ++ show envvars) #endif go (v:vs) = maybe (go vs) return =<< getEnv v |