From 592c65d02bf07d053d2fbe8a568f88d1b28e1a65 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Nov 2015 16:53:25 -0400 Subject: merge from concurrent-output --- src/Propellor/Property/Chroot.hs | 2 +- src/Propellor/Property/Docker.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property') 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"] -- cgit v1.3-2-g0d8e