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

Allow building with S3 disabled again.

Browse source
This commit is contained in:
Joey Hess 2015-10-02 12:12:02 -04:00
parent aaed12f503
commit 16d7035ef7
3 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Configurators/AWS.hs
View file

@ -76,8 +76,10 @@ s3InputAForm defcreds = AWSInput
storageclasses :: [(Text, StorageClass)] storageclasses :: [(Text, StorageClass)]
storageclasses = storageclasses =
[ ("Standard redundancy", StandardRedundancy) [ ("Standard redundancy", StandardRedundancy)
#ifdef WITH_S3
#if MIN_VERSION_aws(0,13,0) #if MIN_VERSION_aws(0,13,0)
, ("Infrequent access (cheaper for backups and archives)", StandardInfrequentAccess) , ("Infrequent access (cheaper for backups and archives)", StandardInfrequentAccess)
#endif
#endif #endif
, ("Reduced redundancy (costs less)", ReducedRedundancy) , ("Reduced redundancy (costs less)", ReducedRedundancy)
] ]

1
debian/changelog vendored
View file

@ -9,6 +9,7 @@ git-annex (5.20150931) UNRELEASED; urgency=medium
matches the key, unless annex.verify=false. matches the key, unless annex.verify=false.
* reinject: Already verified content; this can now be disabled by * reinject: Already verified content; this can now be disabled by
setting annex.verify=false. setting annex.verify=false.
* Allow building with S3 disabled again.
-- Joey Hess <id@joeyh.name> Thu, 01 Oct 2015 12:42:56 -0400 -- Joey Hess <id@joeyh.name> Thu, 01 Oct 2015 12:42:56 -0400

2
doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs:79:0:_-_error:_missing_binary_operator_before_token___34____40____34__.mdwn
View file

@ -326,3 +326,5 @@ git-annex-5.20150930
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Building without Assistant and Webapps flags work. Building without Assistant and Webapps flags work.
> Fixed building without S3. [[done]] --[[Joey]]