avoid using relative path from temp dir to dest file

That failed on OSX. The temp dir was
/var/folders/fb/pnwjj52n7fg0r9mnvpsfll180000gr/T/downloadurl
and the relative path
../../../../../../Volumes/Visitors/joeyh/git-annex/r/.git/...
Didn't work. I have no clue why, how did OSX manage to break this?

But, the relative path is longer most of the time anyway, so let's
just use the absolute path.
This commit is contained in:
Joey Hess 2015-05-07 18:47:24 -04:00
parent e09816b0e6
commit d9bfc78444

View file

@ -252,8 +252,8 @@ download' quiet url file uo = do
- and overwritten files in the current directory, even though
- it was asked to write to a file elsewhere. -}
go cmd opts = withTmpDir "downloadurl" $ \tmp -> do
relfile <- relPathDirToFile tmp file
let ps = addUserAgent uo $ reqParams uo++opts++[File relfile, File url]
absfile <- absPath file
let ps = addUserAgent uo $ reqParams uo++opts++[File absfile, File url]
boolSystem' cmd ps $ \p -> p { cwd = Just tmp }
quietopt s