summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-02-05 14:00:30 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-02-05 14:00:30 -0400
commita9db75e4808134e4ca6f5b8025c4001a3c6fb3bd (patch)
treee975f408cd6163c5d29bb33ea7ee8f0c8ec19e0e
parentbfaac2dafb731ce48c83ba93125f5ba6fcb285f6 (diff)
Windows: Fix S3 special remote; need to call withSocketsDo to support Windows. Thanks, Trent.
-rw-r--r--debian/changelog2
-rw-r--r--doc/bugs/S3_Access_fails_on_windows.mdwn2
-rw-r--r--git-annex.hs3
3 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 64591ba36..d0bf0e865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ git-annex (5.20150114) UNRELEASED; urgency=medium
* Remove support for building without cryptohash.
* Added MD5 and MD5E backends.
* 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
diff --git a/doc/bugs/S3_Access_fails_on_windows.mdwn b/doc/bugs/S3_Access_fails_on_windows.mdwn
index fba0c335d..403d0c0c2 100644
--- a/doc/bugs/S3_Access_fails_on_windows.mdwn
+++ b/doc/bugs/S3_Access_fails_on_windows.mdwn
@@ -38,3 +38,5 @@ index cdaa754..0eed9db 100644
run ps =<< getProgName
where
"""]]
+
+> Thanks very much for the patch! [[done]] --[[Joey]]
diff --git a/git-annex.hs b/git-annex.hs
index cdaa75434..17ce807af 100644
--- a/git-annex.hs
+++ b/git-annex.hs
@@ -9,6 +9,7 @@
import System.Environment (getArgs, getProgName)
import System.FilePath
+import Network.Socket (withSocketsDo)
import qualified CmdLine.GitAnnex
import qualified CmdLine.GitAnnexShell
@@ -22,7 +23,7 @@ import Utility.Env
#endif
main :: IO ()
-main = do
+main = withSocketsDo $ do
ps <- getArgs
run ps =<< getProgName
where