From ebd0711e8aa09580bef81590ea277f7bd1f96871 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Nov 2017 15:14:00 -0400 Subject: Revert "use unix-compat 0.5 on windows" This reverts commit ac57659e61f9743aebd35258e89752ced0040f9f. Too early for this; needs newer Win32 version. Le sigh. --- Annex/Content.hs | 2 +- Annex/Fixup.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Annex') diff --git a/Annex/Content.hs b/Annex/Content.hs index 2ba387105..0b665d4dc 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -50,7 +50,6 @@ module Annex.Content ( ) where import System.IO.Unsafe (unsafeInterleaveIO) -import System.PosixCompat.Files import qualified Data.Set as S import Annex.Common @@ -85,6 +84,7 @@ import Types.Key import Annex.UUID import Annex.InodeSentinal import Utility.InodeCache +import Utility.PosixFiles {- Checks if a given key's content is currently present. -} inAnnex :: Key -> Annex Bool diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs index 4b5149d0a..6a14f22bc 100644 --- a/Annex/Fixup.hs +++ b/Annex/Fixup.hs @@ -15,11 +15,11 @@ import qualified Git.BuildVersion import Utility.Path import Utility.SafeCommand import Utility.Directory +import Utility.PosixFiles import Utility.Exception import System.IO import System.FilePath -import System.PosixCompat.Files import Data.List import Control.Monad import Control.Monad.IfElse -- cgit v1.2.3