getUserEntryForID does not work on windows

Throw an error instead, mentioning the relevant env vars.

1 files changed, 7 insertions, 4 deletions

diff --git a/Utility/UserInfo.hs b/Utility/UserInfo.hs
index 617c3e945..b3e191bbf 100644
--- a/Utility/UserInfo.hs
+++ b/Utility/UserInfo.hs
@@ -48,8 +48,11 @@ myUserGecos = myVal [] userGecos
 #endif
 
 myVal :: [String] -> (UserEntry -> String) -> IO String
-myVal envvars extract = maybe (extract <$> getpwent) return =<< check envvars
+myVal envvars extract = go envvars
   where
-	check [] = return Nothing
-	check (v:vs) = maybe (check vs) (return . Just) =<< getEnv v
-	getpwent = getUserEntryForID =<< getEffectiveUserID
+#ifndef mingw32_HOST_OS
+	go [] = extract <$> (getUserEntryForID =<< getEffectiveUserID)
+#else
+	go [] = error $ "environment not set: " ++ show envvars
+#endif
+	go (v:vs) = maybe (go vs) return =<< getEnv v