psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code formatting.

Browse source
This commit is contained in:
Dan Helfman 2022-11-18 08:35:01 -08:00
parent ca7e18bb29
commit fd39f54df7
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -1,4 +1,5 @@
1.7.5.dev0 1.7.5.dev0
* #311: Override PostgreSQL dump/restore commands via configuration options.
* #604: Fix traceback when a configuration section is present but lacking any options. * #604: Fix traceback when a configuration section is present but lacking any options.
* #607: Clarify examples in include merging and deep merging documentation. * #607: Clarify examples in include merging and deep merging documentation.
* #611: Fix "data" consistency check to support "check_last" and consistency "prefix" options. * #611: Fix "data" consistency check to support "check_last" and consistency "prefix" options.

7
borgmatic/hooks/postgresql.py
View file

@ -59,12 +59,7 @@ def dump_databases(databases, log_prefix, location_config, dry_run):
default_dump_command = 'pg_dumpall' if all_databases else 'pg_dump' default_dump_command = 'pg_dumpall' if all_databases else 'pg_dump'
dump_command = database.get('pg_dump_command') or default_dump_command dump_command = database.get('pg_dump_command') or default_dump_command
command = ( command = (
( (dump_command, '--no-password', '--clean', '--if-exists',)
dump_command,
'--no-password',
'--clean',
'--if-exists',
)
+ (('--host', database['hostname']) if 'hostname' in database else ()) + (('--host', database['hostname']) if 'hostname' in database else ())
+ (('--port', str(database['port'])) if 'port' in database else ()) + (('--port', str(database['port'])) if 'port' in database else ())
+ (('--username', database['username']) if 'username' in database else ()) + (('--username', database['username']) if 'username' in database else ())