summaryrefslogtreecommitdiff
path: root/src/Utility/Directory.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-05-22 15:55:27 -0400
committerJoey Hess <joeyh@joeyh.name>2016-05-22 15:55:27 -0400
commitb5f9026a89602a441e717a167c3d753346172885 (patch)
treeda635a9ea77155dfcf150b13b88db044bf479c78 /src/Utility/Directory.hs
parent65ac730c006184472a7d0cb19deffdd69839530f (diff)
parent0dd63693b8938a1d9a1319811b3d8bdd1569c60f (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Utility/Directory.hs')
-rw-r--r--src/Utility/Directory.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Utility/Directory.hs b/src/Utility/Directory.hs
index 3b12b9fc..693e7713 100644
--- a/src/Utility/Directory.hs
+++ b/src/Utility/Directory.hs
@@ -6,15 +6,14 @@
-}
{-# LANGUAGE CPP #-}
-{-# OPTIONS_GHC -fno-warn-tabs -w #-}
+{-# OPTIONS_GHC -fno-warn-tabs #-}
module Utility.Directory (
module Utility.Directory,
- module System.Directory
+ module Utility.SystemDirectory
) where
import System.IO.Error
-import System.Directory hiding (isSymbolicLink)
import Control.Monad
import System.FilePath
import Control.Applicative
@@ -31,6 +30,7 @@ import Utility.SafeCommand
import Control.Monad.IfElse
#endif
+import Utility.SystemDirectory
import Utility.PosixFiles
import Utility.Tmp
import Utility.Exception