From 4ba1057836d383ff4981ef44136a30d4d7ed7624 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Jan 2025 13:46:13 -0400 Subject: [PATCH] more windows and osx build fixes --- Assistant/Upgrade.hs | 2 +- Utility/StatelessOpenPGP.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs index 3d448c4998..40bef041a1 100644 --- a/Assistant/Upgrade.hs +++ b/Assistant/Upgrade.hs @@ -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 diff --git a/Utility/StatelessOpenPGP.hs b/Utility/StatelessOpenPGP.hs index 874ed84e19..d3709baa27 100644 --- a/Utility/StatelessOpenPGP.hs +++ b/Utility/StatelessOpenPGP.hs @@ -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