mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

more windows and osx build fixes

Browse source
This commit is contained in:
Joey Hess 2025-01-24 15:13:20 -04:00
parent 4ba1057836
commit f16604d2c8
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/Upgrade.hs
View file

@ -165,7 +165,7 @@ upgradeToDistribution newdir cleanup distributionfile = do
{- OS X uses a dmg, so mount it, and copy the contents into place. -} {- OS X uses a dmg, so mount it, and copy the contents into place. -}
unpack = liftIO $ do unpack = liftIO $ do
olddir <- oldVersionLocation olddir <- oldVersionLocation
withTmpDirIn (parentDir newdir) (toOsPath "git-annex.upgrade") $ \tmpdir -> do withTmpDirIn (fromRawFilePath (parentDir (toRawFilePath newdir))) (toOsPath (toRawFilePath "git-annex.upgrade")) $ \tmpdir -> do
void $ boolSystem "hdiutil" void $ boolSystem "hdiutil"
[ Param "attach", File distributionfile [ Param "attach", File distributionfile
, Param "-mountpoint", File tmpdir , Param "-mountpoint", File tmpdir

2
Utility/Gpg.hs
View file

@ -182,7 +182,7 @@ feedRead cmd params passphrase feeder reader = do
withTmpFile (toOsPath "gpg") $ \tmpfile h -> do withTmpFile (toOsPath "gpg") $ \tmpfile h -> do
liftIO $ B.hPutStr h passphrase liftIO $ B.hPutStr h passphrase
liftIO $ hClose h liftIO $ hClose h
let passphrasefile = [Param "--passphrase-file", File (fromosPath tmpfile)] let passphrasefile = [Param "--passphrase-file", File (fromOsPath tmpfile)]
go $ passphrasefile ++ params go $ passphrasefile ++ params
#endif #endif
where where

1
Utility/StatelessOpenPGP.hs
View file

@ -27,7 +27,6 @@ import System.Posix.Types
import System.Posix.IO import System.Posix.IO
#else #else
import Utility.Tmp import Utility.Tmp
import Utility.OsPath
#endif #endif
import Utility.Tmp.Dir import Utility.Tmp.Dir
import Author import Author