summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2016-04-28 15:31:35 -0400
committerJoey Hess2016-04-28 15:31:35 -0400
commit2e513dc98c51eca1cdfce3715b4a017be39734f7 (patch)
treed043e76be4a9300b6dec2ae27075ee6775f6502a /src/Propellor
parent73f07cb6622e891022b88cd13593ff660c7bd327 (diff)
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.)
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Debug.hs2
-rw-r--r--src/Propellor/DotDir.hs2
-rw-r--r--src/Propellor/Engine.hs2
-rw-r--r--src/Propellor/Git.hs2
-rw-r--r--src/Propellor/Gpg.hs2
-rw-r--r--src/Propellor/PrivData.hs2
-rw-r--r--src/Propellor/Property.hs2
-rw-r--r--src/Propellor/Property/Chroot/Util.hs1
8 files changed, 7 insertions, 8 deletions
diff --git a/src/Propellor/Debug.hs b/src/Propellor/Debug.hs
index 790a9a4b..5e729b23 100644
--- a/src/Propellor/Debug.hs
+++ b/src/Propellor/Debug.hs
@@ -2,7 +2,6 @@ module Propellor.Debug where
import Control.Monad.IfElse
import System.IO
-import System.Directory
import System.Log.Logger
import System.Log.Formatter
import System.Log.Handler (setFormatter)
@@ -14,6 +13,7 @@ import Utility.Monad
import Utility.Env
import Utility.Exception
import Utility.Process
+import Utility.Directory
debug :: [String] -> IO ()
debug = debugM "propellor" . unwords
diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs
index 669ac303..f32b52a4 100644
--- a/src/Propellor/DotDir.hs
+++ b/src/Propellor/DotDir.hs
@@ -15,6 +15,7 @@ import Utility.Monad
import Utility.Process
import Utility.SafeCommand
import Utility.Exception
+import Utility.Directory
import Utility.Path
-- This module is autogenerated by the build system.
import qualified Paths_propellor as Package
@@ -24,7 +25,6 @@ import Data.List
import Data.Version
import Control.Monad
import Control.Monad.IfElse
-import System.Directory
import System.FilePath
import System.Posix.Directory
import System.IO
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.
diff --git a/src/Propellor/Git.hs b/src/Propellor/Git.hs
index 949f430b..c3257b31 100644
--- a/src/Propellor/Git.hs
+++ b/src/Propellor/Git.hs
@@ -2,8 +2,8 @@ module Propellor.Git where
import Utility.Process
import Utility.Exception
+import Utility.Directory
-import System.Directory
import Control.Applicative
import Prelude
diff --git a/src/Propellor/Gpg.hs b/src/Propellor/Gpg.hs
index 4e6ceb79..b825d743 100644
--- a/src/Propellor/Gpg.hs
+++ b/src/Propellor/Gpg.hs
@@ -1,7 +1,6 @@
module Propellor.Gpg where
import System.IO
-import System.Directory
import Data.Maybe
import Data.List.Utils
import Control.Monad
@@ -19,6 +18,7 @@ import Utility.Misc
import Utility.Tmp
import Utility.FileSystemEncoding
import Utility.Env
+import Utility.Directory
type KeyId = String
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs
index d3bb3a6d..2e9cdbab 100644
--- a/src/Propellor/PrivData.hs
+++ b/src/Propellor/PrivData.hs
@@ -26,7 +26,6 @@ module Propellor.PrivData (
) where
import System.IO
-import System.Directory
import Data.Maybe
import Data.List
import Data.Typeable
@@ -59,6 +58,7 @@ import Utility.FileMode
import Utility.Env
import Utility.Table
import Utility.FileSystemEncoding
+import Utility.Directory
-- | Allows a Property to access the value of a specific PrivDataField,
-- for use in a specific Context or HostContext.
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.
diff --git a/src/Propellor/Property/Chroot/Util.hs b/src/Propellor/Property/Chroot/Util.hs
index ff227f52..ac703136 100644
--- a/src/Propellor/Property/Chroot/Util.hs
+++ b/src/Propellor/Property/Chroot/Util.hs
@@ -6,7 +6,6 @@ import Utility.Exception
import Utility.Env
import Utility.Directory
-import System.Directory
import Control.Applicative
import Prelude