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

fix Android build, broken for 2 days

Browse source
This commit is contained in:
Joey Hess 2013-05-26 18:14:03 -04:00
parent 2180068e30
commit 749beb5899
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Limit.hs
View file

@ -13,12 +13,6 @@ import Data.Time.Clock.POSIX
import qualified Data.Set as S import qualified Data.Set as S
import qualified Data.Map as M import qualified Data.Map as M
import System.Path.WildMatch import System.Path.WildMatch
#ifdef WITH_TDFA
import Text.Regex.TDFA
import Text.Regex.TDFA.String
#else
import System.Path.WildMatch
#endif
import System.PosixCompat.Files import System.PosixCompat.Files
import Common.Annex import Common.Annex
@ -37,6 +31,14 @@ import Logs.Group
import Utility.HumanTime import Utility.HumanTime
import Utility.DataUnits import Utility.DataUnits
#ifdef WITH_TDFA
import Text.Regex.TDFA
import Text.Regex.TDFA.String
#else
import System.Path.WildMatch
import Types.FileMatcher
#endif
type MatchFiles = AssumeNotPresent -> FileInfo -> Annex Bool type MatchFiles = AssumeNotPresent -> FileInfo -> Annex Bool
type MkLimit = String -> Either String MatchFiles type MkLimit = String -> Either String MatchFiles
type AssumeNotPresent = S.Set UUID type AssumeNotPresent = S.Set UUID
@ -105,7 +107,7 @@ matchglob glob fi =
cregex = compile defaultCompOpt defaultExecOpt regex cregex = compile defaultCompOpt defaultExecOpt regex
regex = '^':wildToRegex glob regex = '^':wildToRegex glob
#else #else
wildCheckCase glob (Annex.matchFile fi) wildCheckCase glob (matchFile fi)
#endif #endif
{- Adds a limit to skip files not believed to be present {- Adds a limit to skip files not believed to be present