diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-09-22 11:03:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-22 11:04:26 -0400 |
| commit | e37c4016bb46d20bf66ecb711b64fbd9af97533f (patch) | |
| tree | 8089f6182cc2950d6e73d5f6c7d2dde0d0c4d3f9 | |
| parent | 61421a4a686eef076b0592384a3ce6e8573bd04e (diff) | |
avoid hard dependency on new version of aws
| -rw-r--r-- | Remote/S3.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 5c5a43661..7b71df2b0 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -499,8 +499,11 @@ getBucketName = map toLower <$$> M.lookup "bucket" getStorageClass :: RemoteConfig -> S3.StorageClass getStorageClass c = case M.lookup "storageclass" c of + Just "REDUCED_REDUNDANCY" -> S3.ReducedRedundancy +#if MIN_VERSION_aws(0,13,0) Just s -> S3.OtherStorageClass (T.pack s) - Nothing -> S3.Standard +#endif + _ -> S3.Standard getPartSize :: RemoteConfig -> Maybe Integer getPartSize c = readSize dataUnits =<< M.lookup "partsize" c diff --git a/debian/changelog b/debian/changelog index e55a52a66..2e436d1c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,9 @@ git-annex (5.20150917) UNRELEASED; urgency=medium * info: Don't allow use in a non-git-annex repository, since it uses the git-annex branch and would create it if it were missing. - * S3: Added support for storageclass=STANDARD_IA to use Amazon's - new Infrequently Accessed storage. - (Needs aws-0.13.0.) - * S3: Use aws-0.13.0, which allows using storageclass=NEARLINE + * S3: When built with aws-0.13.0, supports using more storage classes. + In particular, storageclass=STANDARD_IA to use Amazon's + new Infrequently Accessed storage, and storageclass=NEARLINE to use Google's NearLine storage. -- Joey Hess <id@joeyh.name> Wed, 16 Sep 2015 12:23:33 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index fcab1b7b1..27c2675f8 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -178,7 +178,7 @@ Executable git-annex Build-Depends: regex-compat if flag(S3) - Build-Depends: conduit, conduit-extra, aws (>= 0.13.0), http-client + Build-Depends: conduit, conduit-extra, aws (>= 0.9.2), http-client CPP-Options: -DWITH_S3 if flag(WebDAV) |