From 2baf3b83b021e3b162fdc75b03e38f8b070a9b4a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 8 Jul 2013 17:29:42 -0400
Subject: fsck: Don't claim to fix direct mode when run on a symlink whose
 content is not present.

---
 Annex/Direct.hs | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'Annex')

diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index c958ac287..cf5806ad6 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -189,9 +189,12 @@ toDirectGen k f = do
 		, do
 			{- Copy content from another direct file. -}
 			absf <- liftIO $ absPath f
-			locs <- filterM (\l -> isNothing <$> getAnnexLinkTarget l) =<<
-				(filter (/= absf) <$> addAssociatedFile k f)		
-			return $ Just $ fromdirect locs
+			dlocs <- filterM (goodContent k) =<<
+				filterM (\l -> isNothing <$> getAnnexLinkTarget l) =<<
+				(filter (/= absf) <$> addAssociatedFile k f)
+			case dlocs of
+				[] -> return Nothing
+				(dloc:_) -> return $ Just $ fromdirect dloc
 		)
   where
   	fromindirect loc = do
@@ -201,14 +204,10 @@ toDirectGen k f = do
 		void $ addAssociatedFile k f
 		thawContent loc
 		replaceFile f $ liftIO . moveFile loc
-	fromdirect (loc:locs) = ifM (goodContent k loc)
-		( do
-			replaceFile f $
-				liftIO . void . copyFileExternal loc
-			updateInodeCache k f
-		, fromdirect locs
-		)
-	fromdirect [] = noop
+	fromdirect loc = do
+		replaceFile f $
+			liftIO . void . copyFileExternal loc
+		updateInodeCache k f
 
 {- Removes a direct mode file, while retaining its content in the annex
  - (unless its content has already been changed). -}
-- 
cgit v1.2.3