From 14e5429163f0138f03deaaa1134c8b4982c27141 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 22 May 2016 15:41:28 -0400 Subject: merge Utility from git-annex --- src/Utility/UserInfo.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/Utility/UserInfo.hs') 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 -- cgit v1.2.3