diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
| commit | 425bc1107aebdb701cdcee44da731dd918cd470d (patch) | |
| tree | 25bcacb37277b70aa7bd0caaf0fe7c3edc665653 /Build/EvilSplicer.hs | |
| parent | 20c7644a4d85434cf49840ea92fca0c723710c72 (diff) | |
revert parentDir change
Reverts 2bba5bc22d049272d3328bfa6c452d3e2e50e86c
Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
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 81d4e37c7..fc41c624f 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 (takeDirectory dest) + createDirectoryIfMissing True (parentDir dest) let newcontent = concat $ addimports $ expand lls splices oldcontent <- catchMaybeIO $ readFileStrictAnyEncoding dest when (oldcontent /= Just newcontent) $ do |