diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:29:07 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:55:56 -0400 |
commit | 2bba5bc22d049272d3328bfa6c452d3e2e50e86c (patch) | |
tree | 19feab50e43dc330038224ea98b371916ca02133 /Build/EvilSplicer.hs | |
parent | 014e909a449d0822eff4962a504d6a524abe8fc7 (diff) |
made parentDir return a Maybe FilePath; removed most uses of it
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /
This commit was sponsored by Audric SCHILTKNECHT.
Diffstat (limited to 'Build/EvilSplicer.hs')
-rw-r--r-- | Build/EvilSplicer.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs index fc41c624f..81d4e37c7 100644 --- a/Build/EvilSplicer.hs +++ b/Build/EvilSplicer.hs @@ -204,7 +204,7 @@ applySplices destdir imports splices@(first:_) = do let f = splicedFile first let dest = (destdir </> f) lls <- map (++ "\n") . lines <$> readFileStrictAnyEncoding f - createDirectoryIfMissing True (parentDir dest) + createDirectoryIfMissing True (takeDirectory dest) let newcontent = concat $ addimports $ expand lls splices oldcontent <- catchMaybeIO $ readFileStrictAnyEncoding dest when (oldcontent /= Just newcontent) $ do |