diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-26 18:14:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-26 18:14:03 -0400 |
| commit | 029b25dc0d4ac6b035eedfedb44fdfe7bb35a580 (patch) | |
| tree | 6f460b3f7d8714c9204288643a8164bac6bd773d /Limit.hs | |
| parent | 20b25dd58fa97d0433ed50fb5d1e9a7b8202a70a (diff) | |
fix Android build, broken for 2 days
Diffstat (limited to 'Limit.hs')
| -rw-r--r-- | Limit.hs | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -13,12 +13,6 @@ import Data.Time.Clock.POSIX import qualified Data.Set as S import qualified Data.Map as M 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 Common.Annex @@ -37,6 +31,14 @@ import Logs.Group import Utility.HumanTime 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 MkLimit = String -> Either String MatchFiles type AssumeNotPresent = S.Set UUID @@ -105,7 +107,7 @@ matchglob glob fi = cregex = compile defaultCompOpt defaultExecOpt regex regex = '^':wildToRegex glob #else - wildCheckCase glob (Annex.matchFile fi) + wildCheckCase glob (matchFile fi) #endif {- Adds a limit to skip files not believed to be present |