diff options
| author | lassulus <lass@aidsballs.de> | 2015-07-28 15:29:59 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-07-28 15:29:59 +0200 |
| commit | 7acd1262519d8f15c8eb89a0dce968eb26d6b7d4 (patch) | |
| tree | 71f807a36e60e126b6fdb0be51e70cde4bf64b4e /Zpkgs/tv/lentil/1.patch | |
| parent | 7673c84204bd5bae0426b79c62e95dfccf846756 (diff) | |
| parent | 7920cfad18e69ea30bbe5e70da2cd93e0bbc05cd (diff) | |
Merge branch 'tv' into master
Diffstat (limited to 'Zpkgs/tv/lentil/1.patch')
| -rw-r--r-- | Zpkgs/tv/lentil/1.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/Zpkgs/tv/lentil/1.patch b/Zpkgs/tv/lentil/1.patch deleted file mode 100644 index 6e5a00c..0000000 --- a/Zpkgs/tv/lentil/1.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rN -u old-lentil/src/Lentil/File.hs new-lentil/src/Lentil/File.hs ---- old-lentil/src/Lentil/File.hs 2015-07-20 22:43:23.177620724 +0200 -+++ new-lentil/src/Lentil/File.hs 2015-07-20 22:43:23.177620724 +0200 -@@ -13,10 +13,13 @@ - import Lentil.Types - import Lentil.Parse.Run - -+import System.Directory - import System.FilePath - import System.FilePath.Find -+import Data.Either - import Data.Monoid - import Control.Applicative -+import Control.Exception.Base - - import qualified Data.List as L - -@@ -36,7 +39,12 @@ - -------------- - - findIssues :: [FilePath] -> [FilePath] -> IO [Issue] --findIssues is xs = find always (findClause is xs) "." >>= issueFinder -+findIssues is xs = -+ (mapM (try . canonicalizePath) is :: IO [Either SomeException FilePath]) >>= -+ return . rights >>= -+ mapM (\i -> find always (findClause [i] xs) i) >>= -+ return . concat >>= -+ issueFinder - - -- fp to include, fp to exclude, clause - findClause :: [FilePath] -> [FilePath] -> FindClause Bool -@@ -47,6 +55,6 @@ - (not <$> fmap getAny xc) - where - fp2fc :: FilePath -> FindClause Any -- fp2fc f = Any . L.isPrefixOf (combine "." f) <$> filePath -+ fp2fc f = Any . L.isPrefixOf f <$> filePath - -- TODO: combine funziona su windows? [feature:intermediate] - |