summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--propellor.cabal1
-rw-r--r--src/Propellor/Base.hs4
-rw-r--r--src/Utility/Directory.hs6
-rw-r--r--src/Utility/SystemDirectory.hs16
5 files changed, 23 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 2092e784..137d9d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ propellor (3.0.4) UNRELEASED; urgency=medium
Thanks, davean.
* Module added for the Borg backup system.
Thanks, FĂ©lix Sipma.
+ * Fix build with directory-1.2.6.2.
-- Joey Hess <id@joeyh.name> Thu, 05 May 2016 10:37:43 -0400
diff --git a/propellor.cabal b/propellor.cabal
index beac5c38..547f34a6 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -207,6 +207,7 @@ Library
Utility.Process.NonConcurrent
Utility.SafeCommand
Utility.Scheduled
+ Utility.SystemDirectory
Utility.Table
Utility.ThreadScheduler
Utility.Tmp
diff --git a/src/Propellor/Base.hs b/src/Propellor/Base.hs
index ef75bf03..ae75589f 100644
--- a/src/Propellor/Base.hs
+++ b/src/Propellor/Base.hs
@@ -20,7 +20,7 @@ module Propellor.Base (
, module Propellor.Utilities
-- * System modules
- , module System.Directory
+ , module Utility.SystemDirectory
, module System.IO
, module System.FilePath
, module Data.Maybe
@@ -47,7 +47,7 @@ import Propellor.PropAccum
import Propellor.Location
import Propellor.Utilities
-import System.Directory hiding (isSymbolicLink)
+import Utility.SystemDirectory
import System.IO
import System.FilePath
import Data.Maybe
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
diff --git a/src/Utility/SystemDirectory.hs b/src/Utility/SystemDirectory.hs
new file mode 100644
index 00000000..3dd44d19
--- /dev/null
+++ b/src/Utility/SystemDirectory.hs
@@ -0,0 +1,16 @@
+{- System.Directory without its conflicting isSymbolicLink
+ -
+ - Copyright 2016 Joey Hess <id@joeyh.name>
+ -
+ - License: BSD-2-clause
+ -}
+
+-- Disable warnings because only some versions of System.Directory export
+-- isSymbolicLink.
+{-# OPTIONS_GHC -fno-warn-tabs -w #-}
+
+module Utility.SystemDirectory (
+ module System.Directory
+) where
+
+import System.Directory hiding (isSymbolicLink)