diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-09-17 13:04:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-09-17 13:04:55 -0400 |
| commit | 19863a7a58ca8d4c174773dc4fc873182932d891 (patch) | |
| tree | f9faff23d0eddf2cdd7dc0b66251a2c8f7571273 | |
| parent | 8352c994ea585b103a05734c5b8c7f65412b2788 (diff) | |
WebDav: Fix enableremote crash when the remote already exists. (Bug introduced in version 5.20140817.)
| -rw-r--r-- | Remote/WebDAV.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index bb8b4cc06..d427d67a9 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -183,7 +183,7 @@ testDav url (Just (u, p)) = do test $ liftIO $ evalDAVT url $ do prepDAV user pass makeParentDirs - inLocation tmpDir $ void mkCol + void $ mkColRecursive tmpDir inLocation (tmpLocation "git-annex-test") $ do putContentM (Nothing, L.empty) delContentM diff --git a/debian/changelog b/debian/changelog index 825d8d46d..f11d6d37a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ git-annex (5.20140916) UNRELEASED; urgency=medium automatically shut down the assistant. Closes: #761261 * Windows: Avoid crashing trying to list gpg secret keys, for gcrypt which is not yet supported on Windows. + * WebDav: Fix enableremote crash when the remote already exists. + (Bug introduced in version 5.20140817.) -- Joey Hess <joeyh@debian.org> Mon, 15 Sep 2014 14:39:17 -0400 |