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

use Text.Regex.PCRE.Light.Char8 rather than Text.Regexp

Browse source 
Text.Regexp does not think that á matches . -- seems to be a unicode
problem.
This commit is contained in:
Joey Hess 2010-12-08 14:48:10 -04:00
parent 2099407d8a
commit f8851aad66
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Command.hs
View file

@ -12,7 +12,7 @@ import System.Directory
import System.Posix.Files import System.Posix.Files
import Control.Monad (filterM) import Control.Monad (filterM)
import System.Path.WildMatch import System.Path.WildMatch
import Text.Regex import Text.Regex.PCRE.Light.Char8
import Types import Types
import qualified Backend import qualified Backend
@ -189,12 +189,12 @@ filterFiles l = do
if null exclude if null exclude
then return l' then return l'
else do else do
let regexp = mkRegex $ "^" ++ wildToRegex exclude let regexp = compile ("^" ++ wildToRegex exclude) []
return $ filter (notExcluded regexp) l' return $ filter (notExcluded regexp) l'
where where
notState f = stateLoc /= take stateLocLen f notState f = stateLoc /= take stateLocLen f
stateLocLen = length stateLoc stateLocLen = length stateLoc
notExcluded r f = case matchRegex r f of notExcluded r f = case match r f [] of
Nothing -> True Nothing -> True
Just _ -> False Just _ -> False

2
debian/control vendored
View file

@ -1,7 +1,7 @@
Source: git-annex Source: git-annex
Section: utils Section: utils
Priority: optional 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> Maintainer: Joey Hess <joeyh@debian.org>
Standards-Version: 3.9.1 Standards-Version: 3.9.1
Vcs-Git: git://git.kitenet.net/git-annex Vcs-Git: git://git.kitenet.net/git-annex

1
doc/install.mdwn
View file

@ -3,6 +3,7 @@ To build and use git-annex, you will need:
* `git`: <http://git-scm.com/> * `git`: <http://git-scm.com/>
* The Haskell Platform: <http://haskell.org/platform/> * The Haskell Platform: <http://haskell.org/platform/>
* MissingH: <http://github.com/jgoerzen/missingh/wiki> * MissingH: <http://github.com/jgoerzen/missingh/wiki>
* pcre-light: <http://hackage.haskell.org/package/pcre-light>
* `uuid`: <http://www.ossp.org/pkg/lib/uuid/> * `uuid`: <http://www.ossp.org/pkg/lib/uuid/>
* `xargs`: <http://savannah.gnu.org/projects/findutils/> * `xargs`: <http://savannah.gnu.org/projects/findutils/>
* `rsync`: <http://rsync.samba.org/> (optional but recommended) * `rsync`: <http://rsync.samba.org/> (optional but recommended)