summaryrefslogtreecommitdiff
path: root/src/Propellor/Debug.hs
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/Debug.hs
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/Debug.hs')
-rw-r--r--src/Propellor/Debug.hs2
1 files changed, 1 insertions, 1 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