From 99b407b895d3e9815193d7d4a43bd4bd3a15ccf9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 22 May 2016 15:52:27 -0400 Subject: propellor spin --- debian/changelog | 1 + propellor.cabal | 1 + src/Utility/Directory.hs | 6 +++--- src/Utility/SystemDirectory.hs | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 src/Utility/SystemDirectory.hs 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 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/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 + - + - 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) -- cgit v1.2.3