diff options
| author |  Joey Hess <id@joeyh.name> | 2013-05-11 15:03:00 -0500 |
|---|---|---|
| committer | Joey Hess <id@joeyh.name> | 2013-05-11 15:03:00 -0500 |
| commit | d0fa82fb721cdc85438287e29a94cb796b7bc464 (patch) | |
| tree | 26a2486b8e715b5937ce41679eafd42c02f2310a /Annex/Environment.hs | |
| parent | 679eaf6077375c5d59501d12c79e0891cbdd904f (diff) | |
git-annex now builds on Windows (doesn't work)
Diffstat (limited to 'Annex/Environment.hs')
| -rwxr-xr-x | Annex/Environment.hs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Annex/Environment.hs b/Annex/Environment.hs index fef6989ee..fd757ee2c 100755 --- a/Annex/Environment.hs +++ b/Annex/Environment.hs @@ -10,10 +10,12 @@ module Annex.Environment where import Common.Annex +#ifndef __WINDOWS__ import Utility.UserInfo +#endif import qualified Git.Config -#ifndef mingw32_HOST_OS +#ifndef __WINDOWS__ import System.Posix.Env #endif import Network.BSD @@ -28,7 +30,10 @@ checkEnvironment = do liftIO checkEnvironmentIO checkEnvironmentIO :: IO () -checkEnvironmentIO = do +checkEnvironmentIO = +#ifdef __WINDOWS__ + noop +#else whenM (null <$> myUserGecos) $ do username <- myUserName ensureEnv "GIT_AUTHOR_NAME" username @@ -42,3 +47,4 @@ checkEnvironmentIO = do -- in runshell instead. ensureEnv _ _ = noop #endif +#endif |