mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

webapp: Defaults to sharing box.com account info with friends, allowing one-click enabling of the repository.

Browse source
This commit is contained in:
Joey Hess 2012-11-28 13:31:49 -04:00
parent 6991f47e9e
commit 8dd1d9aaf9
6 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Remote/Glacier.hs
View file

@ -221,7 +221,7 @@ glacierParams c params = datacenter:params
(fromJust $ M.lookup "datacenter" c)
glacierEnv :: RemoteConfig -> UUID -> Annex (Maybe [(String, String)])
glacierEnv c u = go =<< getRemoteCredPair "glacier" c creds
glacierEnv c u = go =<< getRemoteCredPairFor "glacier" c creds
where
go Nothing = return Nothing
go (Just (user, pass)) = do

2
Remote/S3.hs
View file

@ -262,7 +262,7 @@ s3ConnectionRequired c u =
maybe (error "Cannot connect to S3") return =<< s3Connection c u
s3Connection :: RemoteConfig -> UUID -> Annex (Maybe AWSConnection)
s3Connection c u = go =<< getRemoteCredPair "S3" c (AWS.creds u)
s3Connection c u = go =<< getRemoteCredPairFor "S3" c (AWS.creds u)
where
go Nothing = return Nothing
go (Just (ak, sk)) = return $ Just $ AWSConnection host port ak sk

4
Remote/WebDAV.hs
View file

@ -7,7 +7,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
module Remote.WebDAV (remote, setCredsEnv) where
module Remote.WebDAV (remote, davCreds, setCredsEnv) where
import Network.Protocol.HTTP.DAV
import qualified Data.Map as M
@ -321,7 +321,7 @@ noProps :: XML.Document
noProps = XML.parseText_ XML.def $ LT.pack "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<propertyupdate/>"
getCreds :: RemoteConfig -> UUID -> Annex (Maybe CredPair)
getCreds c u = getRemoteCredPair "webdav" c (davCreds u)
getCreds c u = getRemoteCredPairFor "webdav" c (davCreds u)
davCreds :: UUID -> CredPairStorage
davCreds u = CredPairStorage