From 11c3a7cd331f7b07e62493a4e8e37e0cecffc5b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 3 Feb 2016 14:56:34 -0400 Subject: Limit annex.largefiles parsing to the subset of preferred content expressions that make sense in its context. So, not "standard" or "lackingcopies", etc. --- Logs/PreferredContent.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Logs') diff --git a/Logs/PreferredContent.hs b/Logs/PreferredContent.hs index a74effb92..d84abbaba 100644 --- a/Logs/PreferredContent.hs +++ b/Logs/PreferredContent.hs @@ -102,7 +102,7 @@ makeMatcher groupmap configmap groupwantedmap u = go True True | null (lefts tokens) = generate $ rights tokens | otherwise = unknownMatcher u where - tokens = exprParser matchstandard matchgroupwanted (pure groupmap) configmap (Just u) expr + tokens = preferredContentParser matchstandard matchgroupwanted (pure groupmap) configmap (Just u) expr matchstandard | expandstandard = maybe (unknownMatcher u) (go False False) (standardPreferredContent <$> getStandardGroup mygroups) @@ -133,7 +133,7 @@ checkPreferredContentExpression expr = case parsedToMatcher tokens of Left e -> Just e Right _ -> Nothing where - tokens = exprParser matchAll matchAll (pure emptyGroupMap) M.empty Nothing expr + tokens = preferredContentParser matchAll matchAll (pure emptyGroupMap) M.empty Nothing expr {- Puts a UUID in a standard group, and sets its preferred content to use - the standard expression for that group (unless preferred content is -- cgit v1.2.3