summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
Diffstat (limited to 'Annex')
-rw-r--r--Annex/FileMatcher.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs
index e97b80c82..5167a5e02 100644
--- a/Annex/FileMatcher.hs
+++ b/Annex/FileMatcher.hs
@@ -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