fix merge issue
This commit is contained in:
parent
acbe00ff1b
commit
3158c8d526
1 changed files with 2 additions and 1 deletions
|
|
@ -1540,7 +1540,8 @@ def read_config(profile_name, user_config=None):
|
|||
if name in ('anon_retry', 'offline_retry', 'keepalive', 'use_fast_upload'):
|
||||
result[name] = config.getboolean(profile_name, name)
|
||||
elif name in ('max_retries', 'retry_interval',
|
||||
'offline_retry_interval', 'poll_interval', 'timeout'):
|
||||
'offline_retry_interval', 'poll_interval', 'timeout',
|
||||
'upload_blocksize'):
|
||||
try:
|
||||
result[name] = int(value)
|
||||
except ValueError:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue