summaryrefslogtreecommitdiff
path: root/src/Utility
diff options
context:
space:
mode:
authorJoey Hess2014-11-19 00:54:35 -0400
committerJoey Hess2014-11-19 00:55:07 -0400
commit9a779939c4252dc99b888d9fa6cd6d8f3b169610 (patch)
treec6cc9387d1984210a76cbd0115cb1bdd7e95a464 /src/Utility
parent492c2b98a5e001c5ad3d99710c2540b4b95642df (diff)
merge from git-annex
Diffstat (limited to 'src/Utility')
-rw-r--r--src/Utility/Process.hs3
-rw-r--r--src/Utility/SafeCommand.hs1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Utility/Process.hs b/src/Utility/Process.hs
index cd3826d7..e25618eb 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 04fcf390..86e60db0 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