summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--src/Utility/Process/Shim.hs3
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 12e78937..b46c4b4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+propellor (5.10.3) UNRELEASED; urgency=medium
+
+ * Fix display of concurrent output from processes when using
+ Propellor.Property.Conductor.
+ (Reversion introduced in version 5.5.0.)
+
+ -- Joey Hess <id@joeyh.name> Fri, 05 Jun 2020 11:26:21 -0400
+
propellor (5.10.2) unstable; urgency=medium
* Fix build with ghc 8.6.3.
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