avoid build warnings on windows
This commit is contained in:
parent
64e96f12ad
commit
3a08881214
3 changed files with 10 additions and 4 deletions
|
@ -40,12 +40,14 @@ import Control.Concurrent
|
|||
import Control.Concurrent.STM
|
||||
import Control.Concurrent.Async
|
||||
import qualified Data.ByteString as B
|
||||
import qualified Data.ByteString as BS
|
||||
import qualified Data.ByteString.Lazy as L
|
||||
import qualified System.FilePath.ByteString as P
|
||||
import qualified Data.Map as M
|
||||
import qualified Data.Set as S
|
||||
#ifndef mingw32_HOST_OS
|
||||
import qualified Data.ByteString as BS
|
||||
import System.IO.Unsafe
|
||||
#endif
|
||||
|
||||
proxyRemoteSide :: ProtocolVersion -> Bypass -> Remote -> Annex RemoteSide
|
||||
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
|
||||
let retrieve = tryNonAsync $ Remote.retrieveKeyFile r k af
|
||||
(fromRawFilePath tmpfile) nullMeterUpdate vc
|
||||
#ifndef mingw32_HOST_OS
|
||||
ordered <- Remote.retrieveKeyFileInOrder r
|
||||
#else
|
||||
_ <- Remote.retrieveKeyFileInOrder r
|
||||
#endif
|
||||
case fromKey keySize k of
|
||||
#ifndef mingw32_HOST_OS
|
||||
Just size | size > 0 && ordered -> do
|
||||
|
|
4
Test.hs
4
Test.hs
|
@ -37,9 +37,9 @@ import qualified Git.Types
|
|||
import qualified Git.Ref
|
||||
import qualified Git.LsTree
|
||||
import qualified Git.FilePath
|
||||
import qualified Git.Bundle
|
||||
import qualified Annex.Locations
|
||||
#ifndef mingw32_HOST_OS
|
||||
import qualified Git.Bundle
|
||||
import qualified Types.GitConfig
|
||||
#endif
|
||||
import qualified Types.TrustLevel
|
||||
|
@ -452,7 +452,7 @@ test_git_remote_annex exporttree
|
|||
git_annex "get" [annexedfile] "get from origin special remote"
|
||||
diruuid="89ddefa4-a04c-11ef-87b5-e880882a4f98"
|
||||
#else
|
||||
test_git_remote_annex exporttree =
|
||||
test_git_remote_annex _exporttree =
|
||||
-- git-remote-annex is not currently installed on Windows
|
||||
return ()
|
||||
#endif
|
||||
|
|
|
@ -79,7 +79,7 @@ moveFile src dest = tryIO (R.rename src dest) >>= onrename
|
|||
case r of
|
||||
(Left _) -> return False
|
||||
(Right s) -> return $ isDirectory s
|
||||
#endif
|
||||
|
||||
copyright :: Copyright
|
||||
copyright = author JoeyHess (2022-11)
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue