From 3b54c1d3e4b19fc9b16082cb80b531ffd3398e24 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Dec 2012 16:28:27 -0400 Subject: [PATCH] kqueue: Fix bug that made broken symlinks not be noticed. --- Utility/Kqueue.hs | 2 +- debian/changelog | 6 ++++++ ...nt_not_noticing_file_renames__44___not_fixing_files.mdwn | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Utility/Kqueue.hs b/Utility/Kqueue.hs index f9f965f6fb..f0559e531b 100644 --- a/Utility/Kqueue.hs +++ b/Utility/Kqueue.hs @@ -80,7 +80,7 @@ getDirInfo dir = do return $ DirInfo dir contents where getDirEnt f = catchMaybeIO $ do - s <- getFileStatus (dir f) + s <- getSymbolicLinkStatus (dir f) return $ DirEnt f (fileID s) (isDirectory s) {- Difference between the dirCaches of two DirInfos. -} diff --git a/debian/changelog b/debian/changelog index ec9b9f6e34..a0dd005d16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (3.20121212) UNRELEASED; urgency=low + + * kqueue: Fix bug that made broken symlinks not be noticed. + + -- Joey Hess Fri, 14 Dec 2012 16:25:14 -0400 + git-annex (3.20121211) unstable; urgency=low * webapp: Defaults to sharing box.com account info with friends, allowing diff --git a/doc/bugs/assistant_not_noticing_file_renames__44___not_fixing_files.mdwn b/doc/bugs/assistant_not_noticing_file_renames__44___not_fixing_files.mdwn index 4c92623f81..d009b55cd7 100644 --- a/doc/bugs/assistant_not_noticing_file_renames__44___not_fixing_files.mdwn +++ b/doc/bugs/assistant_not_noticing_file_renames__44___not_fixing_files.mdwn @@ -63,4 +63,6 @@ One compiled using cabal from checkout 739c937 Please provide any additional information below. - +> [[fixed|done]]; this turned out to be an kqueue specific bug, +> the kqueue code statted new files, but that files for a broken symlink. +> Using lstat instead fixed this. --[[Joey]]