diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-13 13:30:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-13 13:30:24 -0400 |
| commit | 4a7520003c4917cfcb12cde679b51dd924ba8c79 (patch) | |
| tree | 0879e7523245a125574baaf2b39f37e7e66c0111 | |
| parent | ef6f41df4fe8919d8bb42ffb0f7af18fa2aecce3 (diff) | |
status: Fix a crash if a temp file went away while its size was being checked for status.
| -rw-r--r-- | Command/Status.hs | 7 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Command/Status.hs b/Command/Status.hs index 89d08c794..e1ace0052 100644 --- a/Command/Status.hs +++ b/Command/Status.hs @@ -371,10 +371,11 @@ staleSize label dirspec = go =<< lift (Command.Unused.staleKeys dirspec) onsize size = stat label $ json (++ aside "clean up with git-annex unused") $ return $ roughSize storageUnits False size - keysizes keys = map (fromIntegral . fileSize) <$> stats keys - stats keys = do + keysizes keys = do dir <- lift $ fromRepo dirspec - liftIO $ forM keys $ \k -> getFileStatus (dir </> keyFile k) + liftIO $ forM keys $ \k -> catchDefaultIO 0 $ + fromIntegral . fileSize + <$> getFileStatus (dir </> keyFile k) aside :: String -> String aside s = " (" ++ s ++ ")" diff --git a/debian/changelog b/debian/changelog index 853f9a854..d558b83ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ git-annex (4.20131003) UNRELEASED; urgency=low * Remove bogus runshell loop check. * addurl: Improve message when adding url with wrong size to existing file. * Fixed handling of URL keys that have no recorded size. + * status: Fix a crash if a temp file went away while its size was + being checked for status. -- Joey Hess <joeyh@debian.org> Thu, 03 Oct 2013 15:41:24 -0400 |