diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-10 19:20:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-10 19:20:14 -0400 |
| commit | 899f84a217681833146fadd8f30cd25ed1a9f653 (patch) | |
| tree | 37351958f69f8afef17b96966a30ca2dde79ba1c /Utility | |
| parent | 465c36e8f6a45b888e8f7be8baa52f0eb1759f77 (diff) | |
export CreateProcess fields from Utility.Process
update code to avoid cwd and env redefinition warnings
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/Batch.hs | 1 | ||||
| -rw-r--r-- | Utility/CoProcess.hs | 4 | ||||
| -rw-r--r-- | Utility/ExternalSHA.hs | 1 | ||||
| -rw-r--r-- | Utility/Process.hs | 2 | ||||
| -rw-r--r-- | Utility/SafeCommand.hs | 1 |
5 files changed, 3 insertions, 6 deletions
diff --git a/Utility/Batch.hs b/Utility/Batch.hs index 3f0708180..d6dadae67 100644 --- a/Utility/Batch.hs +++ b/Utility/Batch.hs @@ -16,7 +16,6 @@ import Control.Concurrent.Async import System.Posix.Process #endif import qualified Control.Exception as E -import System.Process (env) {- Runs an operation, at batch priority. - diff --git a/Utility/CoProcess.hs b/Utility/CoProcess.hs index d531f07b7..332c09d49 100644 --- a/Utility/CoProcess.hs +++ b/Utility/CoProcess.hs @@ -37,8 +37,8 @@ data CoProcessSpec = CoProcessSpec } start :: Int -> FilePath -> [String] -> Maybe [(String, String)] -> IO CoProcessHandle -start numrestarts cmd params env = do - s <- start' $ CoProcessSpec numrestarts cmd params env +start numrestarts cmd params environ = do + s <- start' $ CoProcessSpec numrestarts cmd params environ newMVar s start' :: CoProcessSpec -> IO CoProcessState diff --git a/Utility/ExternalSHA.hs b/Utility/ExternalSHA.hs index 8b5ca697c..1ab93262d 100644 --- a/Utility/ExternalSHA.hs +++ b/Utility/ExternalSHA.hs @@ -15,7 +15,6 @@ import Utility.Process import Utility.FileSystemEncoding import Utility.Misc -import System.Process import Data.List import Data.Char import Control.Applicative diff --git a/Utility/Process.hs b/Utility/Process.hs index cd3826d78..1f722af81 100644 --- a/Utility/Process.hs +++ b/Utility/Process.hs @@ -10,7 +10,7 @@ module Utility.Process ( module X, - CreateProcess, + CreateProcess(..), StdHandle(..), readProcess, readProcessEnv, diff --git a/Utility/SafeCommand.hs b/Utility/SafeCommand.hs index 04fcf3908..86e60db0e 100644 --- a/Utility/SafeCommand.hs +++ b/Utility/SafeCommand.hs @@ -9,7 +9,6 @@ module Utility.SafeCommand where import System.Exit import Utility.Process -import System.Process (env) import Data.String.Utils import Control.Applicative import System.FilePath |