path: root/src/Propellor/Gpg.hs
diff options
authorJoey Hess2016-04-28 15:31:35 -0400
committerJoey Hess2016-04-28 15:31:35 -0400
commit2e513dc98c51eca1cdfce3715b4a017be39734f7 (patch)
treed043e76be4a9300b6dec2ae27075ee6775f6502a /src/Propellor/Gpg.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/Gpg.hs')
1 files changed, 1 insertions, 1 deletions
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