summaryrefslogtreecommitdiff
path: root/src/Utility
diff options
context:
space:
mode:
authorJoey Hess2020-06-05 11:28:32 -0400
committerJoey Hess2020-06-05 11:28:32 -0400
commit73a74d3bc8c6694121c2a5fccf655d556fb0ec86 (patch)
treea91843a868485fed20d28dbb3d72491ac4cfe435 /src/Utility
parent372700ea7c1f96dadfa6076c4759a9d6b8f277af (diff)
fix bad merge of Utility.Process.Shim from git-annex
Fixes display of concurrent output from processes when using Propellor.Property.Conductor. (Reversion introduced in version 5.5.0.) Utility.Process.Shim's whole point is to let propellor differ from git-annex here, but I forgot and copied over git-annex's version.
Diffstat (limited to 'src/Utility')
-rw-r--r--src/Utility/Process/Shim.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Utility/Process/Shim.hs b/src/Utility/Process/Shim.hs
index 09312c7f..cec00658 100644
--- a/src/Utility/Process/Shim.hs
+++ b/src/Utility/Process/Shim.hs
@@ -1,3 +1,4 @@
module Utility.Process.Shim (module X) where
-import System.Process as X
+import System.Process as X hiding (createProcess, waitForProcess
+import System.Process.Concurrent