mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Avoid crashing when built with MagicMime support, but when the magic database cannot be loaded.

Browse source
This commit is contained in:
Joey Hess 2016-02-23 14:39:56 -04:00
parent 2bf90c7b56
commit a5bf674bec
Failed to extract signature
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/FileMatcher.hs
View file

@ -129,8 +129,10 @@ preferredContentParser matchstandard matchgroupwanted getgroupmap configmap mu e
mkLargeFilesParser :: Annex (String -> [ParseResult])
mkLargeFilesParser = do
#ifdef WITH_MAGICMIME
magicmime <- liftIO $ magicOpen [MagicMimeType]
liftIO $ magicLoadDefault magicmime
magicmime <- liftIO $ catchMaybeIO $ do
m <- magicOpen [MagicMimeType]
liftIO $ magicLoadDefault m
return m
#endif
let parse = parseToken $ commonTokens
#ifdef WITH_MAGICMIME