summaryrefslogtreecommitdiff
path: root/Annex/ReplaceFile.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-06 16:50:37 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-06 16:54:01 -0400
commitec356e3c121c9be66ffd99aa68fedf6267522f1c (patch)
tree66aa594afddc7574a3275dbb5bb8780a2e13d552 /Annex/ReplaceFile.hs
parenta279c22dbcddee19d14a1b492d8d996fef0e3e3d (diff)
fix temp filename
Was not putting it inside the temp dir, but next to it! This was just wrong, and it led to a longer filename that desired being used, leading to some bug reports.
Diffstat (limited to 'Annex/ReplaceFile.hs')
-rw-r--r--Annex/ReplaceFile.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/ReplaceFile.hs b/Annex/ReplaceFile.hs
index b6126ba7e..94d2688a1 100644
--- a/Annex/ReplaceFile.hs
+++ b/Annex/ReplaceFile.hs
@@ -30,7 +30,7 @@ replaceFile file action = do
filemax <- liftIO $ fileNameLengthLimit misctmpdir
let basetmp = take (filemax `div` 2) (takeFileName file)
withTmpDirIn misctmpdir basetmp $ \tmpdir -> do
- let tmpfile = tmpdir <> basetmp
+ let tmpfile = tmpdir </> basetmp
action tmpfile
liftIO $ replaceFileFrom tmpfile file