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