diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-28 13:18:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-28 13:18:44 -0400 |
| commit | 4e6ae471667beaa308607b3b03522ebabaf3014a (patch) | |
| tree | 8772da57337397c4a6d85232c3d5faa49a17fd32 /Utility/LockFile | |
| parent | 20edc36c790793faf1a01494572d3200308bb114 (diff) | |
Fix build with directory-1.2.6.2.
It started exporting a isSymbolicLink which supports windows. But,
git-annex does no use symlinks on windows yet and this conflicts with the
function by the same name from unix-compat, so hide it.
Diffstat (limited to 'Utility/LockFile')
| -rw-r--r-- | Utility/LockFile/PidLock.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utility/LockFile/PidLock.hs b/Utility/LockFile/PidLock.hs index a21014c0e..50c38d70c 100644 --- a/Utility/LockFile/PidLock.hs +++ b/Utility/LockFile/PidLock.hs @@ -34,7 +34,7 @@ import Data.List import Network.BSD import System.FilePath import Data.Hash.MD5 -import System.Directory +import System.Directory hiding (isSymbolicLink) import Control.Applicative import Prelude |