From 2e513dc98c51eca1cdfce3715b4a017be39734f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Apr 2016 15:31:35 -0400 Subject: Fix build with directory-1.2.6.2. It's now exporting a conflicting isSymbolicLink https://github.com/haskell/directory/issues/52 Only a few places in propellor use isSymbolicLink, but to prevent future problems, made as much of it as possible import Utility.Directory, which re-exports System.Directory without the conflicting symbol. (Utility.Tmp and System.Console.Concurrent.Internal cannot import Utility.Directory due to cycles, and don't use isSymbolicLink anyway.) --- src/Propellor/Engine.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Engine.hs') diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs index f0035c40..8958da6b 100644 --- a/src/Propellor/Engine.hs +++ b/src/Propellor/Engine.hs @@ -17,7 +17,6 @@ import "mtl" Control.Monad.RWS.Strict import System.PosixCompat import System.Posix.IO import System.FilePath -import System.Directory import Control.Applicative import Prelude @@ -28,6 +27,7 @@ import Propellor.Message import Propellor.Exception import Propellor.Info import Utility.Exception +import Utility.Directory -- | Gets the Properties of a Host, and ensures them all, -- with nice display of what's being done. -- cgit v1.2.3