duplicity-team team mailing list archive

[edso <edgar.soldin@xxxxxx>]

edso has proposed merging lp:~ed.so/duplicity/boto.fixup into lp:duplicity.

Commit message:
fix manpage indention
clarify difference between boto backends
add boto+s3:// for future use when boto3+s3:// will become default s3 backend

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~ed.so/duplicity/boto.fixup/+merge/377053
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~ed.so/duplicity/boto.fixup into lp:duplicity.

=== modified file 'bin/duplicity.1'
--- bin/duplicity.1	2019-12-04 06:03:51 +0000
+++ bin/duplicity.1	2019-12-20 15:33:04 +0000
@@ -1321,13 +1321,16 @@
 .br
 s3+http://bucket_name[/prefix]
 .br
-boto3+s3://bucket_name[/prefix]
+.BR "defaults" " to the legacy boto backend based on boto v2 (last update 2018/07)"
+.br
+.BR "alternatively" " try the newer boto3+s3://bucket_name[/prefix]"
 .PP
-See also
+For details see
 .B "A NOTE ON AMAZON S3"
-and
+and see also
 .B "A NOTE ON EUROPEAN S3 BUCKETS"
 below.
+.RE
 .PP
 .B "SCP/SFTP access"
 .PP

=== modified file 'duplicity/backends/botobackend.py'
--- duplicity/backends/botobackend.py	2019-12-01 22:04:43 +0000
+++ duplicity/backends/botobackend.py	2019-12-20 15:33:04 +0000
@@ -32,3 +32,6 @@
 duplicity.backend.register_backend(u"s3", BotoBackend)
 duplicity.backend.register_backend(u"s3+http", BotoBackend)
 duplicity.backend.uses_netloc.extend([u's3'])
+# s3 is also implemented by the newer boto3 backend now
+duplicity.backend.register_backend(u"boto+s3", BotoBackend)
+duplicity.backend.uses_netloc.extend([u'boto+s3'])