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/Property.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property.hs') diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index 55c39ee2..af36ed58 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -44,7 +44,6 @@ module Propellor.Property ( , assume ) where -import System.Directory import System.FilePath import Control.Monad import Data.Monoid @@ -66,6 +65,7 @@ import Propellor.EnsureProperty import Utility.Exception import Utility.Monad import Utility.Misc +import Utility.Directory -- | Makes a perhaps non-idempotent Property be idempotent by using a flag -- file to indicate whether it has run before. -- cgit v1.2.3