borgmatic-collective/borgmatic
borgmatic-collective
/
borgmatic
14
57
Fork 41
Code Issues 53 Pull Requests 2 Actions Packages Releases 122 Activity

fix bug where port becomes truthy when none is converted to str

This commit is contained in:
Divyansh Singh 2023-06-15 23:34:50 +05:30
parent 82d851d891
commit 8389851f2f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
borgmatic/hooks/mongodb.py
View File

@ -143,7 +143,7 @@ def build_restore_command(extract_process, database, dump_filename, connection_p
Return the mongorestore command from a single database configuration.
'''
hostname = connection_params['hostname'] or database.get('restore_hostname', database.get('hostname'))
port = str(connection_params['port'] or database.get('restore_port', database.get('port')))
port = str(connection_params['port'] or database.get('restore_port', database.get('port', '')))
username = connection_params['username'] or database.get('restore_username', database.get('username'))
password = connection_params['password'] or database.get('restore_password', database.get('password'))

2
borgmatic/hooks/mysql.py
View File

@ -201,7 +201,7 @@ def restore_database_dump(database_config, log_prefix, location_config, dry_run,
database = database_config[0]
hostname = connection_params['hostname'] or database.get('restore_hostname', database.get('hostname'))
port = str(connection_params['port'] or database.get('restore_port', database.get('port')))
port = str(connection_params['port'] or database.get('restore_port', database.get('port', '')))
username = connection_params['username'] or database.get('restore_username', database.get('username'))
password = connection_params['password'] or database.get('restore_password', database.get('password'))

2
borgmatic/hooks/postgresql.py
View File

@ -222,7 +222,7 @@ def restore_database_dump(database_config, log_prefix, location_config, dry_run,
database = database_config[0]
hostname = connection_params['hostname'] or database.get('restore_hostname', database.get('hostname'))
port = str(connection_params['port'] or database.get('restore_port', database.get('port')))
port = str(connection_params['port'] or database.get('restore_port', database.get('port', '')))
username = connection_params['username'] or database.get('restore_username', database.get('username'))
all_databases = bool(database['name'] == 'all')