export CreateProcess fields from Utility.Process

update code to avoid cwd and env redefinition warnings

1 files changed, 5 insertions, 5 deletions

diff --git a/Assistant/Install.hs b/Assistant/Install.hs
index afbe5b9c0..89025cdae 100644
--- a/Assistant/Install.hs
+++ b/Assistant/Install.hs
@@ -122,15 +122,15 @@ installNautilus _ = noop
 cleanEnvironment :: IO (Maybe [(String, String)])
 cleanEnvironment = clean <$> getEnvironment
   where
-	clean env
+	clean environ
 		| null vars = Nothing
-		| otherwise = Just $ catMaybes $ map (restoreorig env) env
+		| otherwise = Just $ catMaybes $ map (restoreorig environ) environ
 		| otherwise = Nothing
 	  where
 		vars = words $ fromMaybe "" $
-			lookup "GIT_ANNEX_STANDLONE_ENV" env
-		restoreorig oldenv p@(k, _v)
-			| k `elem` vars = case lookup ("ORIG_" ++ k) oldenv of
+			lookup "GIT_ANNEX_STANDLONE_ENV" environ
+		restoreorig oldenviron p@(k, _v)
+			| k `elem` vars = case lookup ("ORIG_" ++ k) oldenviron of
 				(Just v')
 					| not (null v') -> Just (k, v')
 				_ -> Nothing