Revert "try truncateFilePath on windows again"
This reverts commit 0d4abbcb92
.
Test suite was failing again with that.
This commit is contained in:
parent
0d4abbcb92
commit
8678588e6a
1 changed files with 6 additions and 0 deletions
|
@ -5,6 +5,8 @@
|
|||
- Licensed under the GNU AGPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP #-}
|
||||
|
||||
module Annex.ReplaceFile (
|
||||
replaceGitAnnexDirFile,
|
||||
replaceGitDirFile,
|
||||
|
@ -57,7 +59,11 @@ replaceFile createdirectory file action = replaceFile' createdirectory file (con
|
|||
|
||||
replaceFile' :: (RawFilePath -> Annex ()) -> RawFilePath -> (a -> Bool) -> (RawFilePath -> Annex a) -> Annex a
|
||||
replaceFile' createdirectory file checkres action = withOtherTmp $ \othertmpdir -> do
|
||||
#ifndef mingw32_HOST_OS
|
||||
let basetmp = relatedTemplate' (P.takeFileName file)
|
||||
#else
|
||||
let basetmp = toRawFilePath "t"
|
||||
#endif
|
||||
withTmpDirIn (fromRawFilePath othertmpdir) (toOsPath basetmp) $ \tmpdir -> do
|
||||
let tmpfile = toRawFilePath tmpdir P.</> basetmp
|
||||
r <- action tmpfile
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue