mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 01:37:20 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5766 from ThomasWaldmann/remote-options

Browse source 
--remote-* option names deprecation
This commit is contained in:
TW 2021-04-16 19:07:44 +02:00 committed by GitHub
commit 56a75ee691
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/borg/archiver.py
View file

@ -2548,6 +2548,8 @@ def preprocess_args(self, args):
('--noatime', None, 'Warning: "--noatime" has been deprecated because it is the default now.'), ('--noatime', None, 'Warning: "--noatime" has been deprecated because it is the default now.'),
('--nobsdflags', None, 'Warning: "--nobsdflags" has been deprecated. Use --noflags instead.'), ('--nobsdflags', None, 'Warning: "--nobsdflags" has been deprecated. Use --noflags instead.'),
('--numeric-owner', None, 'Warning: "--numeric-owner" has been deprecated. Use --numeric-ids instead.'), ('--numeric-owner', None, 'Warning: "--numeric-owner" has been deprecated. Use --numeric-ids instead.'),
('--remote-ratelimit', None, 'Warning: "--remote-ratelimit" has been deprecated. Use --upload-ratelimit instead.'),
('--remote-buffer', None, 'Warning: "--remote-buffer" has been deprecated. Use --upload-buffer instead.'),
] ]
for i, arg in enumerate(args[:]): for i, arg in enumerate(args[:]):
for old_name, new_name, warning in deprecations: for old_name, new_name, warning in deprecations:
@ -2743,10 +2745,14 @@ def define_common_options(add_common_option):
help='set umask to M (local only, default: %(default)04o)') help='set umask to M (local only, default: %(default)04o)')
add_common_option('--remote-path', metavar='PATH', dest='remote_path', add_common_option('--remote-path', metavar='PATH', dest='remote_path',
help='use PATH as borg executable on the remote (default: "borg")') help='use PATH as borg executable on the remote (default: "borg")')
add_common_option('--remote-ratelimit', metavar='RATE', dest='remote_ratelimit', type=int, add_common_option('--remote-ratelimit', metavar='RATE', dest='upload_ratelimit', type=int,
help='set remote network upload rate limit in kiByte/s (default: 0=unlimited)') help='deprecated, use --upload-ratelimit')
add_common_option('--remote-buffer', metavar='UPLOAD_BUFFER', dest='remote_buffer', type=int, add_common_option('--upload-ratelimit', metavar='RATE', dest='upload_ratelimit', type=int,
help='set upload buffer size in MiB. (default: 0=no buffer)') help='set network upload rate limit in kiByte/s (default: 0=unlimited)')
add_common_option('--remote-buffer', metavar='UPLOAD_BUFFER', dest='upload_buffer', type=int,
help='deprecated, use --upload-buffer')
add_common_option('--upload-buffer', metavar='UPLOAD_BUFFER', dest='upload_buffer', type=int,
help='set network upload buffer size in MiB. (default: 0=no buffer)')
add_common_option('--consider-part-files', dest='consider_part_files', action='store_true', add_common_option('--consider-part-files', dest='consider_part_files', action='store_true',
help='treat part files like normal files (e.g. to list/extract them)') help='treat part files like normal files (e.g. to list/extract them)')
add_common_option('--debug-profile', metavar='FILE', dest='debug_profile', default=None, add_common_option('--debug-profile', metavar='FILE', dest='debug_profile', default=None,

4
src/borg/remote.py
View file

@ -543,8 +543,8 @@ def __init__(self, location, create=False, exclusive=False, lock_wait=None, lock
self.responses = {} self.responses = {}
self.async_responses = {} self.async_responses = {}
self.shutdown_time = None self.shutdown_time = None
self.ratelimit = SleepingBandwidthLimiter(args.remote_ratelimit * 1024 if args and args.remote_ratelimit else 0) self.ratelimit = SleepingBandwidthLimiter(args.upload_ratelimit * 1024 if args and args.upload_ratelimit else 0)
self.upload_buffer_size_limit = args.remote_buffer * 1024 * 1024 if args and args.remote_buffer else 0 self.upload_buffer_size_limit = args.upload_buffer * 1024 * 1024 if args and args.upload_buffer else 0
self.unpacker = get_limited_unpacker('client') self.unpacker = get_limited_unpacker('client')
self.server_version = parse_version('1.0.8') # fallback version if server is too old to send version information self.server_version = parse_version('1.0.8') # fallback version if server is too old to send version information
self.p = None self.p = None