From a82f5af34e255253b38e7862436fc86f96316cda Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Sep 2013 12:50:29 -0400 Subject: fsck: Fix detection and fixing of present direct mode files that are wrongly represented as standin symlinks on crippled filesystems. --- Command/Fsck.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Command') diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 35d6fc7b6..5e150f936 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -271,7 +271,7 @@ verifyDirectMapping key file = do {- Ensures that files whose content is available are in direct mode. -} verifyDirectMode :: Key -> FilePath -> Annex Bool verifyDirectMode key file = do - whenM (isDirect <&&> islink) $ do + whenM (isDirect <&&> isJust <$> isAnnexLink file) $ do v <- toDirectGen key file case v of Nothing -> noop @@ -279,8 +279,6 @@ verifyDirectMode key file = do showNote "fixing direct mode" a return True - where - islink = liftIO $ isSymbolicLink <$> getSymbolicLinkStatus file {- The size of the data for a key is checked against the size encoded in - the key's metadata, if available. -- cgit v1.2.3