From: Joey Hess Date: Wed, 22 Jan 2025 18:42:27 +0000 (-0400) Subject: fix reversion X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~6^2~195^2~46 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c5fe457e0158420ed7771069e79b72adf7d057b2;p=git-annex.git fix reversion 793ddecd4b72a5e4746b3b426d3bca400737118b made installWrapper not do newline conversion on windows. --- diff --git a/Assistant/Install.hs b/Assistant/Install.hs index da33b16842..94a40369cc 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -17,7 +17,6 @@ import Utility.Shell import Utility.Tmp import Utility.Env import Utility.SshConfig -import qualified Utility.FileIO as F #ifdef darwin_HOST_OS import Utility.OSX @@ -105,7 +104,7 @@ installWrapper file content = do curr <- catchDefaultIO "" $ readFileStrict (fromRawFilePath file) when (curr /= content) $ do createDirectoryIfMissing True (fromRawFilePath (parentDir file)) - viaTmp F.writeFile' (toOsPath file) (encodeBS content) + viaTmp (writeFile . fromRawFilePath . fromOsPath) (toOsPath file) content modifyFileMode file $ addModes [ownerExecuteMode] installFileManagerHooks :: FilePath -> IO ()