From 76b59539593fcb1fe3e825bd0e1cd452cbc8d806 Mon Sep 17 00:00:00 2001 From: Thomas LEVEIL Date: Mon, 23 Jul 2018 00:44:58 +0200 Subject: [PATCH] `list_archives()` unconditionally returns the output value (regardless of JSON or not) --- borgmatic/borg/list.py | 7 +------ borgmatic/commands/borgmatic.py | 6 ++++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/borgmatic/borg/list.py b/borgmatic/borg/list.py index ebfb66fc..dca73393 100644 --- a/borgmatic/borg/list.py +++ b/borgmatic/borg/list.py @@ -32,9 +32,4 @@ def list_archives(verbosity, repository, storage_config, local_path='borg', remo with tempfile.TemporaryFile() as f_output: subprocess.check_call(full_command, stdout=f_output) f_output.seek(0) - output = f_output.read().decode() - - if json: - return output - else: - sys.stdout.write(output) + return f_output.read().decode() diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index c9bacdb7..609028f2 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -169,7 +169,7 @@ def run_configuration(config_filename, args): # pragma: no cover ) if args.list: logger.info('{}: Listing archives'.format(repository)) - result = borg_list.list_archives( + output = borg_list.list_archives( args.verbosity, repository, storage, @@ -178,7 +178,9 @@ def run_configuration(config_filename, args): # pragma: no cover json=args.json, ) if args.json: - json_results.append(json.loads(result)) + json_results.append(json.loads(output)) + else: + sys.stdout.write(output) if args.info: logger.info('{}: Displaying summary info for archives'.format(repository)) borg_info.display_archives_info(