Merge branch 'master' into ospath
This commit is contained in:
commit
dd01406018
2 changed files with 2 additions and 2 deletions
|
@ -165,7 +165,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 (fromRawFilePath (parentDir (toRawFilePath newdir))) "git-annex.upgrade" $ \tmpdir -> do
|
||||
withTmpDirIn (parentDir newdir) (toOsPath "git-annex.upgrade") $ \tmpdir -> do
|
||||
void $ boolSystem "hdiutil"
|
||||
[ Param "attach", File distributionfile
|
||||
, Param "-mountpoint", File tmpdir
|
||||
|
|
|
@ -163,7 +163,7 @@ feedRead cmd subcmd params password emptydirectory feeder reader = do
|
|||
withTmpFile (toOsPath "sop") $ \tmpfile h -> do
|
||||
liftIO $ B.hPutStr h password
|
||||
liftIO $ hClose h
|
||||
let passwordfile = [Param $ "--with-password=" ++ fromOsPath tmpfile]
|
||||
let passwordfile = [Param $ "--with-password=" ++ fromRawFilePath (fromOsPath tmpfile)]
|
||||
-- Don't need to pass emptydirectory since @FD is not used,
|
||||
-- and so tmpfile also does not need to be made absolute.
|
||||
case emptydirectory of
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue