summaryrefslogtreecommitdiff
path: root/src/Propellor
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
parent4d63a9f0ad327cba305e239e51d02e5e33213eda (diff)
merge from concurrent-output
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Gpg.hs5
-rw-r--r--src/Propellor/Message.hs2
-rw-r--r--src/Propellor/PrivData.hs5
-rw-r--r--src/Propellor/Property/Chroot.hs2
-rw-r--r--src/Propellor/Property/Docker.hs2
5 files changed, 9 insertions, 7 deletions
diff --git a/src/Propellor/Gpg.hs b/src/Propellor/Gpg.hs
index 9c58a5d1..960c70d3 100644
--- a/src/Propellor/Gpg.hs
+++ b/src/Propellor/Gpg.hs
@@ -7,6 +7,8 @@ import System.Directory
import Data.Maybe
import Data.List.Utils
import Control.Monad
+import System.Console.Concurrent
+import System.Console.Concurrent.Internal (ConcurrentProcessHandle(..))
import Propellor.PrivData.Paths
import Propellor.Message
@@ -16,7 +18,6 @@ import Utility.Monad
import Utility.Misc
import Utility.Tmp
import Utility.FileSystemEncoding
-import Utility.ConcurrentOutput
type KeyId = String
@@ -129,7 +130,7 @@ gitCommit msg ps = do
ps'' <- gpgSignParams ps'
if isNothing msg
then do
- (_, _, _, p) <- createProcessForeground $
+ (_, _, _, ConcurrentProcessHandle p) <- createProcessForeground $
proc "git" (toCommand ps'')
checkSuccessProcess p
else boolSystem "git" ps''
diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs
index 7df5104a..e964c664 100644
--- a/src/Propellor/Message.hs
+++ b/src/Propellor/Message.hs
@@ -25,9 +25,9 @@ import Control.Monad.IO.Class (liftIO, MonadIO)
import Control.Applicative
import System.IO.Unsafe (unsafePerformIO)
import Control.Concurrent
+import System.Console.Concurrent
import Propellor.Types
-import Utility.ConcurrentOutput
import Utility.PartialPrelude
import Utility.Monad
import Utility.Exception
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
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index 0c00e8f4..8d1a2388 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -27,11 +27,11 @@ import qualified Propellor.Property.Systemd.Core as Systemd
import qualified Propellor.Property.File as File
import qualified Propellor.Shim as Shim
import Propellor.Property.Mount
-import Utility.ConcurrentOutput
import qualified Data.Map as M
import Data.List.Utils
import System.Posix.Directory
+import System.Console.Concurrent
-- | Specification of a chroot. Normally you'll use `debootstrapped` or
-- `bootstrapped` to construct a Chroot value.
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index f2dbaaf5..0cc8212b 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -56,7 +56,6 @@ import qualified Propellor.Property.Cmd as Cmd
import qualified Propellor.Shim as Shim
import Utility.Path
import Utility.ThreadScheduler
-import Utility.ConcurrentOutput
import Control.Concurrent.Async hiding (link)
import System.Posix.Directory
@@ -65,6 +64,7 @@ import Prelude hiding (init)
import Data.List hiding (init)
import Data.List.Utils
import qualified Data.Map as M
+import System.Console.Concurrent
installed :: Property NoInfo
installed = Apt.installed ["docker.io"]