← Back to branch summary

~antmak/duplicity/0.7-par2-fix

« back to all changes in this revision

Viewing changes to duplicity/backends/botobackend.py

  • Committer: Michael Terry
  • Date: 2014-04-28 02:49:39 UTC
  • mto: This revision was merged to the branch mainline in revision 981.
  • Revision ID: michael.terry@canonical.com-20140428024939-p2fbckcm35uh0ogs
further fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
duplicity/backends/botobackend.py
22
22
 
23
23
import duplicity.backend
24
24
from duplicity import globals
25
 
from ._boto_multi import BotoBackend as BotoMultiUploadBackend
26
 
from ._boto_single import BotoBackend as BotoSingleUploadBackend
27
25
 
28
26
if globals.s3_use_multiprocessing:
29
 
    duplicity.backend.register_backend("gs", BotoMultiUploadBackend)
30
 
    duplicity.backend.register_backend("s3", BotoMultiUploadBackend)
31
 
    duplicity.backend.register_backend("s3+http", BotoMultiUploadBackend)
 
27
    from ._boto_multi import BotoBackend
32
28
else:
33
 
    duplicity.backend.register_backend("gs", BotoSingleUploadBackend)
34
 
    duplicity.backend.register_backend("s3", BotoSingleUploadBackend)
35
 
    duplicity.backend.register_backend("s3+http", BotoSingleUploadBackend)
 
29
    from ._boto_single import BotoBackend
 
30
 
 
31
duplicity.backend.register_backend("gs", BotoBackend)
 
32
duplicity.backend.register_backend("s3", BotoBackend)
 
33
duplicity.backend.register_backend("s3+http", BotoBackend)