diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-02 16:01:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-02 16:01:20 -0400 |
| commit | c056b953033c20f6816cea832215ee1c51a34744 (patch) | |
| tree | d199de7a68f335a160a6fc90922f0eb6d927d230 | |
| parent | 1bc39540ad74ce601b0e33f1d64345a8630daa1e (diff) | |
Deal with box.com changing the url of their webdav endpoint.
Use new url when making new remotes.
Transparently rewrite old url to new for existing remotes.
| -rw-r--r-- | Remote/WebDAV.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index 738dbde3f..acee624ae 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -220,7 +220,10 @@ davAction r unconfigured action = do _ -> return unconfigured configUrl :: Remote -> Maybe DavUrl -configUrl r = M.lookup "url" $ config r +configUrl r = fixup <$> M.lookup "url" (config r) + where + -- box.com DAV url changed + fixup = replace "https://www.box.com/dav/" "https://dav.box.com/dav/" toDavUser :: String -> DavUser toDavUser = B8.fromString diff --git a/debian/changelog b/debian/changelog index 19e4cd9ed..4e864d244 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ git-annex (5.20131131) UNRELEASED; urgency=low use hashDirMixed. Closes: #731142 * copy --from, get --from: When --force is used, ignore the location log and always try to get the file from the remote. + * Deal with box.com changing the url of their webdav endpoint. -- Joey Hess <joeyh@debian.org> Sun, 01 Dec 2013 13:57:58 -0400 |