From 802f4615d785a520744c912446dab06569526a91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 1 Jan 2016 13:22:38 -0400
Subject: convert isPointerFile from Annex to IO

---
 Annex/AutoMerge.hs | 2 +-
 Annex/Content.hs   | 2 +-
 Annex/Link.hs      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Annex')

diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs
index a332596f6..462e87e09 100644
--- a/Annex/AutoMerge.hs
+++ b/Annex/AutoMerge.hs
@@ -248,7 +248,7 @@ cleanConflictCruft resolvedks resolvedfs unstagedmap = do
 		| S.member f fs || S.member (conflictCruftBase f) fs = anyM id
 			[ pure (S.member i is)
 			, inks <$> isAnnexLink f
-			, inks <$> isPointerFile f
+			, inks <$> liftIO (isPointerFile f)
 			]
 		| otherwise = return False
 
diff --git a/Annex/Content.hs b/Annex/Content.hs
index be460f068..2a8b295d3 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -505,7 +505,7 @@ moveAnnex key src = withObjectLoc key storeobject storedirect
 	alreadyhave = liftIO $ removeFile src
 
 populatePointerFile :: Key -> FilePath -> FilePath -> Annex ()
-populatePointerFile k obj f = go =<< isPointerFile f
+populatePointerFile k obj f = go =<< liftIO (isPointerFile f)
   where
 	go (Just k') | k == k' = do
 		liftIO $ nukeFile f
diff --git a/Annex/Link.hs b/Annex/Link.hs
index 61c61b561..7f1a1b14d 100644
--- a/Annex/Link.hs
+++ b/Annex/Link.hs
@@ -153,6 +153,6 @@ formatPointer k =
 	toInternalGitPath (pathSeparator:objectDir </> key2file k) ++ "\n"
 
 {- Checks if a file is a pointer to a key. -}
-isPointerFile :: FilePath -> Annex (Maybe Key)
-isPointerFile f = liftIO $ catchDefaultIO Nothing $ 
+isPointerFile :: FilePath -> IO (Maybe Key)
+isPointerFile f = catchDefaultIO Nothing $ 
 	parseLinkOrPointer <$> L.readFile f
-- 
cgit v1.2.3