diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-21 15:09:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-21 15:09:40 -0400 |
| commit | 8f3d1dd13b495083fa4f09c8416677f5127d3ec2 (patch) | |
| tree | 028c9e6787d637ad06f573f8e2823b8ef15fa4f5 /Remote/S3.hs | |
| parent | 43201c32868c12461b46dd7e503c653608a40198 (diff) | |
include creds location in info
This is intended to let the user easily tell if a remote's creds are
coming from info embedded in the repository, or instead from the
environment, or perhaps are locally stored in a creds file.
This commit was sponsored by Frédéric Schütz.
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 154fb1ed4..5a956a5df 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -72,7 +72,8 @@ gen r u c gc = new <$> remoteCost gc expensiveRemoteCost availability = GloballyAvailable, remotetype = remote, mkUnavailable = gen r u (M.insert "host" "!dne!" c) gc, - getInfo = return [("bucket", fromMaybe "unknown" (getBucket c))] + getInfo = includeCredsInfo c (AWS.creds u) + [ ("bucket", fromMaybe "unknown" (getBucket c)) ] } s3Setup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID) |