Pārlūkot izejas kodu

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

Divyansh Singh 2 gadi atpakaļ
vecāks
revīzija
8389851f2f

+ 1 - 1
borgmatic/hooks/mongodb.py

@@ -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'))
 

+ 1 - 1
borgmatic/hooks/mysql.py

@@ -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'))
 

+ 1 - 1
borgmatic/hooks/postgresql.py

@@ -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')