Merge branch 'master' into desymlink
This commit is contained in:
commit
ffdd08fd2e
33 changed files with 97 additions and 100 deletions
|
@ -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)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue