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

Limit annex.largefiles parsing to the subset of preferred content expressions that make sense in its context.

Browse source 
So, not "standard" or "lackingcopies", etc.
This commit is contained in:
Joey Hess 2016-02-03 14:56:34 -04:00
parent cdf5977053
commit 403b56fb91
Failed to extract signature
6 changed files with 110 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Logs/PreferredContent.hs
View file

@ -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