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

avoid build warnings on windows

Browse source
This commit is contained in:
Joey Hess 2025-01-30 14:49:38 -04:00
parent 64e96f12ad
commit 3a08881214
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Annex/Proxy.hs
View file

@ -40,12 +40,14 @@ import Control.Concurrent
import Control.Concurrent.STM import Control.Concurrent.STM
import Control.Concurrent.Async import Control.Concurrent.Async
import qualified Data.ByteString as B import qualified Data.ByteString as B
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy as L
import qualified System.FilePath.ByteString as P import qualified System.FilePath.ByteString as P
import qualified Data.Map as M import qualified Data.Map as M
import qualified Data.Set as S import qualified Data.Set as S
#ifndef mingw32_HOST_OS
import qualified Data.ByteString as BS
import System.IO.Unsafe import System.IO.Unsafe
#endif
proxyRemoteSide :: ProtocolVersion -> Bypass -> Remote -> Annex RemoteSide proxyRemoteSide :: ProtocolVersion -> Bypass -> Remote -> Annex RemoteSide
proxyRemoteSide clientmaxversion bypass r proxyRemoteSide clientmaxversion bypass r
@ -262,7 +264,11 @@ proxySpecialRemote protoversion r ihdl ohdl owaitv oclosedv mexportdb = go
proxyget offset af k = withproxytmpfile k $ \tmpfile -> do proxyget offset af k = withproxytmpfile k $ \tmpfile -> do
let retrieve = tryNonAsync $ Remote.retrieveKeyFile r k af let retrieve = tryNonAsync $ Remote.retrieveKeyFile r k af
(fromRawFilePath tmpfile) nullMeterUpdate vc (fromRawFilePath tmpfile) nullMeterUpdate vc
#ifndef mingw32_HOST_OS
ordered <- Remote.retrieveKeyFileInOrder r ordered <- Remote.retrieveKeyFileInOrder r
#else
_ <- Remote.retrieveKeyFileInOrder r
#endif
case fromKey keySize k of case fromKey keySize k of
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
Just size | size > 0 && ordered -> do Just size | size > 0 && ordered -> do

4
Test.hs
View file

@ -37,9 +37,9 @@ import qualified Git.Types
import qualified Git.Ref import qualified Git.Ref
import qualified Git.LsTree import qualified Git.LsTree
import qualified Git.FilePath import qualified Git.FilePath
import qualified Git.Bundle
import qualified Annex.Locations import qualified Annex.Locations
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import qualified Git.Bundle
import qualified Types.GitConfig import qualified Types.GitConfig
#endif #endif
import qualified Types.TrustLevel import qualified Types.TrustLevel
@ -452,7 +452,7 @@ test_git_remote_annex exporttree
git_annex "get" [annexedfile] "get from origin special remote" git_annex "get" [annexedfile] "get from origin special remote"
diruuid="89ddefa4-a04c-11ef-87b5-e880882a4f98" diruuid="89ddefa4-a04c-11ef-87b5-e880882a4f98"
#else #else
test_git_remote_annex exporttree = test_git_remote_annex _exporttree =
-- git-remote-annex is not currently installed on Windows -- git-remote-annex is not currently installed on Windows
return () return ()
#endif #endif

2
Utility/MoveFile.hs
View file

@ -79,7 +79,7 @@ moveFile src dest = tryIO (R.rename src dest) >>= onrename
case r of case r of
(Left _) -> return False (Left _) -> return False
(Right s) -> return $ isDirectory s (Right s) -> return $ isDirectory s
#endif
copyright :: Copyright copyright :: Copyright
copyright = author JoeyHess (2022-11) copyright = author JoeyHess (2022-11)
#endif