diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-25 15:13:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-25 15:26:33 -0400 |
| commit | 156703043d825c4da5f0080106f130d214fc1d46 (patch) | |
| tree | 9b768021bdd58c9f1d734e4be6b6fb1d2c953000 | |
| parent | b36d8f7d5658be508613f8cb8cf3f22bb460736d (diff) | |
Windows webdav: Fix DOS path separator bug.
Use posix </> etc for urls.
| -rw-r--r-- | Remote/WebDAV.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/todo/windows_support.mdwn | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index 8ac9c2c79..301ec537c 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -24,8 +24,9 @@ import Network.HTTP.Conduit (HttpException(..)) #endif import Network.HTTP.Types import System.IO.Error +import System.FilePath.Posix ((</>), addTrailingPathSeparator) -import Common.Annex +import Common.Annex hiding ((</>), addTrailingPathSeparator) import Types.Remote import qualified Git import Config diff --git a/debian/changelog b/debian/changelog index 1e260a424..1bce6a26c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ git-annex (5.20140222) UNRELEASED; urgency=medium * repair: Optimise unpacking of pack files, and avoid repeated error messages about corrupt pack files. * Make annex.web-options be used in several places that call curl. + * Windows webdav: Fix DOS path separator bug. -- Joey Hess <joeyh@debian.org> Fri, 21 Feb 2014 13:03:04 -0400 diff --git a/doc/todo/windows_support.mdwn b/doc/todo/windows_support.mdwn index ea532dfc1..75c576401 100644 --- a/doc/todo/windows_support.mdwn +++ b/doc/todo/windows_support.mdwn @@ -30,6 +30,8 @@ now! --[[Joey]] (and possibly gpg) are not prompted there anymore. * Local pairing seems to fail, after acking on Linux box, it stalls. + (Also, of course, the Windows box is unlikely to have a ssh server, + so only pairing with a !Windows box will work.) * gcrypt is not ported to windows (and as a shell script, may need to be rewritten) |