diff options
| -rw-r--r-- | Command/Fsck.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 3 deletions
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. diff --git a/debian/changelog b/debian/changelog index 1a94257d1..514d84a2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ git-annex (4.20130912) UNRELEASED; urgency=low * remotes: New command, displays a compact table of remotes that contain files. (Thanks, anarcat for display code and mastensg for inspiration.) + * fsck: Fix detection and fixing of present direct mode files that are + wrongly represented as standin symlinks on crippled filesystems. -- Joey Hess <joeyh@debian.org> Thu, 12 Sep 2013 12:14:46 -0400 |