path: root/src/Propellor/Property.hs
diff options
authorJoey Hess2016-04-28 15:31:35 -0400
committerJoey Hess2016-04-28 15:31:35 -0400
commit2e513dc98c51eca1cdfce3715b4a017be39734f7 (patch)
treed043e76be4a9300b6dec2ae27075ee6775f6502a /src/Propellor/Property.hs
parent73f07cb6622e891022b88cd13593ff660c7bd327 (diff)
Fix build with directory-
It's now exporting a conflicting isSymbolicLink 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.)
Diffstat (limited to 'src/Propellor/Property.hs')
1 files changed, 1 insertions, 1 deletions
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.