diff options
author | Joey Hess <joey@kitenet.net> | 2013-08-04 13:12:18 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-08-04 13:18:05 -0400 |
commit | 381c1f7634e20a2faa0b15255870f9dbf745f230 (patch) | |
tree | 52f5bd3a605dc89ca9d29d66b48c49e9956752ee /Remote/Git.hs | |
parent | 9d06348fa368d502fd1330969cad3c0ea25286fa (diff) |
squash compiler warnings on Windows
Diffstat (limited to 'Remote/Git.hs')
-rw-r--r-- | Remote/Git.hs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index c9cebfb14..e269b9ad8 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -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 |