summaryrefslogtreecommitdiff
path: root/src/Propellor/PrivData.hs
diff options
context:
space:
mode:
authorJoey Hess2015-11-01 16:53:25 -0400
committerJoey Hess2015-11-01 16:53:25 -0400
commit592c65d02bf07d053d2fbe8a568f88d1b28e1a65 (patch)
tree49a3c1a7aa976043d72ee396681fe11ddd3e0194 /src/Propellor/PrivData.hs
parent4d63a9f0ad327cba305e239e51d02e5e33213eda (diff)
merge from concurrent-output
Diffstat (limited to 'src/Propellor/PrivData.hs')
-rw-r--r--src/Propellor/PrivData.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs
index 6b77f782..a1e34abc 100644
--- a/src/Propellor/PrivData.hs
+++ b/src/Propellor/PrivData.hs
@@ -36,6 +36,8 @@ import "mtl" Control.Monad.Reader
import qualified Data.Map as M
import qualified Data.Set as S
import qualified Data.ByteString.Lazy as L
+import System.Console.Concurrent
+import System.Console.Concurrent.Internal (ConcurrentProcessHandle(..))
import Propellor.Types
import Propellor.Types.PrivData
@@ -54,7 +56,6 @@ import Utility.FileMode
import Utility.Env
import Utility.Table
import Utility.FileSystemEncoding
-import Utility.ConcurrentOutput
import Utility.Process
-- | Allows a Property to access the value of a specific PrivDataField,
@@ -194,7 +195,7 @@ editPrivData field context = do
hClose th
maybe noop (\p -> writeFileProtected' f (`L.hPut` privDataByteString p)) v
editor <- getEnvDefault "EDITOR" "vi"
- (_, _, _, p) <- createProcessForeground $ proc editor [f]
+ (_, _, _, ConcurrentProcessHandle p) <- createProcessForeground $ proc editor [f]
unlessM (checkSuccessProcess p) $
error "Editor failed; aborting."
PrivData <$> readFile f