projects
/
git-annex.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
487f7f9
)
fix build on OSX
author
Joey Hess
<joeyh@joeyh.name>
Thu, 12 Nov 2020 15:36:14 +0000
(11:36 -0400)
committer
Joey Hess
<joeyh@joeyh.name>
Thu, 12 Nov 2020 15:36:14 +0000
(11:36 -0400)
Assistant/Upgrade.hs
patch
|
blob
|
history
diff --git
a/Assistant/Upgrade.hs
b/Assistant/Upgrade.hs
index 6efd75041432be1dc77254da0eb0692b125d5da7..db6f6a26e0faba0dae1561f334a5a6ae2f622851 100644
(file)
--- a/
Assistant/Upgrade.hs
+++ b/
Assistant/Upgrade.hs
@@
-163,7
+163,7
@@
upgradeToDistribution newdir cleanup distributionfile = do
{- OS X uses a dmg, so mount it, and copy the contents into place. -}
unpack = liftIO $ do
olddir <- oldVersionLocation
- withTmpDirIn (
parentDir newdir
) "git-annex.upgrade" $ \tmpdir -> do
+ withTmpDirIn (
fromRawFilePath (parentDir (toRawFilePath newdir))
) "git-annex.upgrade" $ \tmpdir -> do
void $ boolSystem "hdiutil"
[ Param "attach", File distributionfile
, Param "-mountpoint", File tmpdir