diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-09-04 12:40:33 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-04 13:09:38 -0400 |
| commit | 5ce97e8c736c121d53af23d7036264868a461db8 (patch) | |
| tree | 1c8b180a503996be3b0ea63fc667bc564f2c3fcc /Remote/S3.hs | |
| parent | 2aea8192e1769c4acfbc130ba4d788abd5ee4539 (diff) | |
implement exporttree=yes configuration
* Only export to remotes that were initialized to support it.
* Prevent storing key/value on export remotes.
* Prevent enabling exporttree=yes and encryption in the same remote.
SetupStage Enable was changed to take the old RemoteConfig.
This allowed only setting exporttree when initially setting up a
remote, and not configuring it later after stuff might already be stored
in the remote.
Went with =yes rather than =true for consistency with other parts of
git-annex. Changed docs accordingly.
This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 341d14b4e..ffa6a11bb 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -129,8 +129,9 @@ s3Setup' ss u mcreds c gc (c', encsetup) <- encryptionSetup c gc c'' <- setRemoteCredPair encsetup c' gc (AWS.creds u) mcreds let fullconfig = c'' `M.union` defaults - when (ss == Init) $ - genBucket fullconfig gc u + case ss of + Init -> genBucket fullconfig gc u + _ -> return () use fullconfig archiveorg = do |