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

squash compiler warnings on Windows

Browse source
This commit is contained in:
Joey Hess 2013-08-04 13:12:18 -04:00
parent 6a97896b47
commit 06db8e0bd9
8 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Remote/Git.hs
View file

@ -17,7 +17,6 @@ import qualified Data.Map as M
import Control.Exception.Extensible
import Common.Annex
import Utility.CopyFile
import Utility.Rsync
import Remote.Helper.Ssh
import Annex.Ssh
@ -44,6 +43,9 @@ import Types.Key
import qualified Fields
import Logs.Location
import Utility.Metered
#ifndef mingw32_HOST_OS
import Utility.CopyFile
#endif
import Control.Concurrent
import Control.Concurrent.MSampleVar
@ -360,8 +362,8 @@ copyFromRemote' r key file dest
bracketIO noop (const $ tryIO $ killThread tid) (const $ a feeder)
copyFromRemoteCheap :: Remote -> Key -> FilePath -> Annex Bool
copyFromRemoteCheap r key file
#ifndef mingw32_HOST_OS
copyFromRemoteCheap r key file
| not $ Git.repoIsUrl (repo r) = guardUsable (repo r) False $ do
loc <- liftIO $ gitAnnexLocation key (repo r) $
fromJust $ remoteGitConfig $ gitconfig r
@ -371,8 +373,10 @@ copyFromRemoteCheap r key file
( copyFromRemote' r key Nothing file
, return False
)
#endif
| otherwise = return False
#else
copyFromRemoteCheap _ _ _ = return False
#endif
{- Tries to copy a key's content to a remote's annex. -}
copyToRemote :: Remote -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool