diff options
Diffstat (limited to 'Annex/Environment.hs')
| -rwxr-xr-x | Annex/Environment.hs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Annex/Environment.hs b/Annex/Environment.hs index fd757ee2c..33569386e 100755 --- a/Annex/Environment.hs +++ b/Annex/Environment.hs @@ -10,16 +10,10 @@ module Annex.Environment where import Common.Annex -#ifndef __WINDOWS__ +import Utility.Env import Utility.UserInfo -#endif import qualified Git.Config -#ifndef __WINDOWS__ -import System.Posix.Env -#endif -import Network.BSD - {- Checks that the system's environment allows git to function. - Git requires a GECOS username, or suitable git configuration, or - environment variables. -} @@ -41,7 +35,7 @@ checkEnvironmentIO = where #ifndef __ANDROID__ -- existing environment is not overwritten - ensureEnv var val = setEnv var val False + ensureEnv var val = void $ setEnv var val False #else -- Environment setting is broken on Android, so this is dealt with -- in runshell instead. |