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

avoid EvilSplicer crashing on encoding problems, including LANG=C with utf-8 in files

Browse source
This commit is contained in:
Joey Hess 2013-12-19 02:37:21 -04:00
parent c315b88304
commit 46f99c7764
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Build/EvilSplicer.hs
View file

@ -199,10 +199,10 @@ applySplices :: FilePath -> Maybe String -> [Splice] -> IO ()
applySplices destdir imports splices@(first:_) = do applySplices destdir imports splices@(first:_) = do
let f = splicedFile first let f = splicedFile first
let dest = (destdir </> f) let dest = (destdir </> f)
lls <- map (++ "\n") . lines <$> readFileStrict f lls <- map (++ "\n") . lines <$> readFileStrictAnyEncoding f
createDirectoryIfMissing True (parentDir dest) createDirectoryIfMissing True (parentDir dest)
let newcontent = concat $ addimports $ expand lls splices let newcontent = concat $ addimports $ expand lls splices
oldcontent <- catchMaybeIO $ readFileStrict dest oldcontent <- catchMaybeIO $ readFileStrictAnyEncoding dest
when (oldcontent /= Just newcontent) $ do when (oldcontent /= Just newcontent) $ do
putStrLn $ "splicing " ++ f putStrLn $ "splicing " ++ f
writeFile dest newcontent writeFile dest newcontent