summaryrefslogtreecommitdiff
path: root/Logs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-03 14:56:34 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-03 15:04:42 -0400
commit11c3a7cd331f7b07e62493a4e8e37e0cecffc5b0 (patch)
tree746fb1ccdfe06f8eb093a0d2d4a2757a8090d3e3 /Logs
parent01c701b5a5c18cfa952394ae1cbd2249cfd08f51 (diff)
Limit annex.largefiles parsing to the subset of preferred content expressions that make sense in its context.
So, not "standard" or "lackingcopies", etc.
Diffstat (limited to 'Logs')
-rw-r--r--Logs/PreferredContent.hs4
1 files changed, 2 insertions, 2 deletions
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