diff options
author | Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
commit | 49a456e8be7fcfdf22554bd2c019da7f9d77ec5f (patch) | |
tree | 07d3e3ef1d83c374cdfaf6bbd76d7aeb05c5c29c /Logs | |
parent | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (diff) | |
parent | 7db480af0f944ca0e6c062cd1243c63ad7f878d1 (diff) |
Merge branch 'master' into desymlink
Diffstat (limited to 'Logs')
-rw-r--r-- | Logs/PreferredContent.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Logs/PreferredContent.hs b/Logs/PreferredContent.hs index e0eb140b1..3340cf5ef 100644 --- a/Logs/PreferredContent.hs +++ b/Logs/PreferredContent.hs @@ -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) |