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

Merge branch 'master' into desymlink

Browse source
This commit is contained in:
Joey Hess 2012-12-13 00:46:10 -04:00
commit ffdd08fd2e
33 changed files with 97 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Logs/PreferredContent.hs
View file

@ -91,7 +91,7 @@ makeMatcher :: GroupMap -> UUID -> String -> Utility.Matcher.Matcher MatchFiles
makeMatcher groupmap u s
| s == "standard" = standardMatcher groupmap u
| null (lefts tokens) = Utility.Matcher.generate $ rights tokens
| otherwise = matchAll
| otherwise = matchAll
where
tokens = map (parseToken (Just u) groupmap) (tokenizeMatcher s)