mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

clean up build warnings on Windows

Browse source
This commit is contained in:
Joey Hess 2017-11-14 14:14:10 -04:00
parent 8dd84b87f9
commit 07c4be500d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Utility/UserInfo.hs
View file

@ -15,11 +15,13 @@ module Utility.UserInfo (
) where
import Utility.Env
import Utility.Data
import Utility.Exception
#ifndef mingw32_HOST_OS
import Utility.Data
import Control.Applicative
#endif
import System.PosixCompat
import Control.Applicative
import Prelude
{- Current user's home directory.
@ -58,6 +60,7 @@ myVal envvars extract = go envvars
#ifndef mingw32_HOST_OS
go [] = Right . extract <$> (getUserEntryForID =<< getEffectiveUserID)
#else
go [] = return $ Left ("environment not set: " ++ show envvars)
go [] = return $ either Left (Right . extract) $
Left ("environment not set: " ++ show envvars)
#endif
go (v:vs) = maybe (go vs) (return . Right) =<< getEnv v