use Text.Regex.PCRE.Light.Char8 rather than Text.Regexp
Text.Regexp does not think that á matches . -- seems to be a unicode problem.
This commit is contained in:
parent
2099407d8a
commit
f8851aad66
3 changed files with 5 additions and 4 deletions
|
@ -12,7 +12,7 @@ import System.Directory
|
|||
import System.Posix.Files
|
||||
import Control.Monad (filterM)
|
||||
import System.Path.WildMatch
|
||||
import Text.Regex
|
||||
import Text.Regex.PCRE.Light.Char8
|
||||
|
||||
import Types
|
||||
import qualified Backend
|
||||
|
@ -189,12 +189,12 @@ filterFiles l = do
|
|||
if null exclude
|
||||
then return l'
|
||||
else do
|
||||
let regexp = mkRegex $ "^" ++ wildToRegex exclude
|
||||
let regexp = compile ("^" ++ wildToRegex exclude) []
|
||||
return $ filter (notExcluded regexp) l'
|
||||
where
|
||||
notState f = stateLoc /= take stateLocLen f
|
||||
stateLocLen = length stateLoc
|
||||
notExcluded r f = case matchRegex r f of
|
||||
notExcluded r f = case match r f [] of
|
||||
Nothing -> True
|
||||
Just _ -> False
|
||||
|
||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -1,7 +1,7 @@
|
|||
Source: git-annex
|
||||
Section: utils
|
||||
Priority: optional
|
||||
Build-Depends: debhelper (>= 7.0.50), ghc6, libghc6-missingh-dev, libghc6-testpack-dev, ikiwiki, uuid, rsync
|
||||
Build-Depends: debhelper (>= 7.0.50), ghc6, libghc6-missingh-dev, libghc6-pcre-light-dev, libghc6-testpack-dev, ikiwiki, uuid, rsync
|
||||
Maintainer: Joey Hess <joeyh@debian.org>
|
||||
Standards-Version: 3.9.1
|
||||
Vcs-Git: git://git.kitenet.net/git-annex
|
||||
|
|
|
@ -3,6 +3,7 @@ To build and use git-annex, you will need:
|
|||
* `git`: <http://git-scm.com/>
|
||||
* The Haskell Platform: <http://haskell.org/platform/>
|
||||
* MissingH: <http://github.com/jgoerzen/missingh/wiki>
|
||||
* pcre-light: <http://hackage.haskell.org/package/pcre-light>
|
||||
* `uuid`: <http://www.ossp.org/pkg/lib/uuid/>
|
||||
* `xargs`: <http://savannah.gnu.org/projects/findutils/>
|
||||
* `rsync`: <http://rsync.samba.org/> (optional but recommended)
|
||||
|
|
Loading…
Reference in a new issue