diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-24 15:14:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-24 15:29:17 -0400 |
| commit | 278ac4da12315a90aededea02993c68924bb7a76 (patch) | |
| tree | 50d83dfadebee0e996d82c3678285e5a47c1da41 /Remote/WebDAV.hs | |
| parent | ddc3612609e100f9230c7f1157948ebaf8b9685f (diff) | |
webapp: Fix creation of box.com, S3, and Glacier repositories, broken in 5.20140221.
Diffstat (limited to 'Remote/WebDAV.hs')
| -rw-r--r-- | Remote/WebDAV.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index 6ce83470b..4714f10dd 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -82,10 +82,10 @@ webdavSetup mu mcreds c = do let url = fromMaybe (error "Specify url=") $ M.lookup "url" c c' <- encryptionSetup c - creds <- getCreds c' u + creds <- maybe (getCreds c' u) (return . Just) mcreds testDav url creds gitConfigSpecialRemote u c' "webdav" "true" - c'' <- setRemoteCredPair c' (davCreds u) mcreds + c'' <- setRemoteCredPair c' (davCreds u) creds return (c'', u) store :: Remote -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool |