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

Windows: Fix S3 special remote; need to call withSocketsDo to support Windows. Thanks, Trent.

Browse source
This commit is contained in:
Joey Hess 2015-02-05 14:00:30 -04:00
parent c79cb9b054
commit bf9058ac4f
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -31,6 +31,8 @@ git-annex (5.20150114) UNRELEASED; urgency=medium
* Remove support for building without cryptohash. * Remove support for building without cryptohash.
* Added MD5 and MD5E backends. * Added MD5 and MD5E backends.
* assistant: Fix local pairing when ssh pubkey comment contains spaces. * assistant: Fix local pairing when ssh pubkey comment contains spaces.
* Windows: Fix S3 special remote; need to call withSocketsDo to support
Windows. Thanks, Trent.
-- Joey Hess <id@joeyh.name> Tue, 13 Jan 2015 17:03:39 -0400 -- Joey Hess <id@joeyh.name> Tue, 13 Jan 2015 17:03:39 -0400

2
doc/bugs/S3_Access_fails_on_windows.mdwn
View file

@ -38,3 +38,5 @@ index cdaa754..0eed9db 100644
run ps =<< getProgName run ps =<< getProgName
where where
"""]] """]]
> Thanks very much for the patch! [[done]] --[[Joey]]

3
git-annex.hs
View file

@ -9,6 +9,7 @@
import System.Environment (getArgs, getProgName) import System.Environment (getArgs, getProgName)
import System.FilePath import System.FilePath
import Network.Socket (withSocketsDo)
import qualified CmdLine.GitAnnex import qualified CmdLine.GitAnnex
import qualified CmdLine.GitAnnexShell import qualified CmdLine.GitAnnexShell
@ -22,7 +23,7 @@ import Utility.Env
#endif #endif
main :: IO () main :: IO ()
main = do main = withSocketsDo $ do
ps <- getArgs ps <- getArgs
run ps =<< getProgName run ps =<< getProgName
where where