From 9a779939c4252dc99b888d9fa6cd6d8f3b169610 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Nov 2014 00:54:35 -0400 Subject: [PATCH] merge from git-annex --- src/Utility/Process.hs | 3 ++- src/Utility/SafeCommand.hs | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Utility/Process.hs b/src/Utility/Process.hs index cd3826d..e25618e 100644 --- a/src/Utility/Process.hs +++ b/src/Utility/Process.hs @@ -10,7 +10,7 @@ module Utility.Process ( module X, - CreateProcess, + CreateProcess(..), StdHandle(..), readProcess, readProcessEnv, @@ -31,6 +31,7 @@ module Utility.Process ( stdinHandle, stdoutHandle, stderrHandle, + bothHandles, processHandle, devNull, ) where diff --git a/src/Utility/SafeCommand.hs b/src/Utility/SafeCommand.hs index 04fcf39..86e60db 100644 --- a/src/Utility/SafeCommand.hs +++ b/src/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