diff options
author | Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
commit | 49a456e8be7fcfdf22554bd2c019da7f9d77ec5f (patch) | |
tree | 07d3e3ef1d83c374cdfaf6bbd76d7aeb05c5c29c /Remote/WebDAV.hs | |
parent | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (diff) | |
parent | 7db480af0f944ca0e6c062cd1243c63ad7f878d1 (diff) |
Merge branch 'master' into desymlink
Diffstat (limited to 'Remote/WebDAV.hs')
-rw-r--r-- | Remote/WebDAV.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index 391027d78..70faa7539 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -55,7 +55,7 @@ gen r u c = new <$> remoteCost r expensiveRemoteCost uuid = u, cost = cst, name = Git.repoDescribe r, - storeKey = store this, + storeKey = store this, retrieveKeyFile = retrieve this, retrieveKeyFileCheap = retrieveCheap this, removeKey = remove this, @@ -314,10 +314,10 @@ getCreds c u = getRemoteCredPairFor "webdav" c (davCreds u) davCreds :: UUID -> CredPairStorage davCreds u = CredPairStorage - { credPairFile = fromUUID u - , credPairEnvironment = ("WEBDAV_USERNAME", "WEBDAV_PASSWORD") - , credPairRemoteKey = Just "davcreds" - } + { credPairFile = fromUUID u + , credPairEnvironment = ("WEBDAV_USERNAME", "WEBDAV_PASSWORD") + , credPairRemoteKey = Just "davcreds" + } setCredsEnv :: (String, String) -> IO () setCredsEnv creds = setEnvCredPair creds $ davCreds undefined |