From 87e3b699c0869b2f4a1b7d350022d586e96b7852 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 6 Jul 2020 19:45:24 +0200 Subject: [PATCH] revert 0-formatting to be compatible with previous behaviour as we format differences (growing/shrinking) we want: -N # negative / shrinking 0 # no change -> no +/- sign here! +N # positive / growing --- src/borg/helpers/parseformat.py | 2 +- src/borg/testsuite/helpers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/borg/helpers/parseformat.py b/src/borg/helpers/parseformat.py index 01d130536..7331fc998 100644 --- a/src/borg/helpers/parseformat.py +++ b/src/borg/helpers/parseformat.py @@ -271,7 +271,7 @@ def parse_file_size(s): def sizeof_fmt(num, suffix='B', units=None, power=None, sep='', precision=2, sign=False): - sign = '+' if sign else '' + sign = '+' if sign and num > 0 else '' fmt = '{0:{1}.{2}f}{3}{4}{5}' prec = 0 for unit in units[:-1]: diff --git a/src/borg/testsuite/helpers.py b/src/borg/testsuite/helpers.py index ebad92cef..f8b6fa40b 100644 --- a/src/borg/testsuite/helpers.py +++ b/src/borg/testsuite/helpers.py @@ -579,7 +579,7 @@ def test_file_size_precision(): def test_file_size_sign(): si_size_map = { - 0: '+0 B', + 0: '0 B', 1: '+1 B', 1234: '+1.23 kB', -1: '-1 B',