From e488e69f41860f78b70a1257167ea4fa32592b71 Mon Sep 17 00:00:00 2001 From: Milkey Mouse Date: Sat, 25 Nov 2017 17:06:02 -0800 Subject: [PATCH 1/2] Use name of command for "virtual man page" name This makes it slightly easier to debug manpage issues without removing the virtmanpage hack. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2670bbfc8..7140ac161 100644 --- a/setup.py +++ b/setup.py @@ -674,7 +674,7 @@ class build_man(Command): roles.register_local_role('issue', issue) # We give the source_path so that docutils can find relative includes # as-if the document where located in the docs/ directory. - man_page = publish_string(source=rst, source_path='docs/virtmanpage.rst', writer=manpage.Writer()) + man_page = publish_string(source=rst, source_path='docs/%s.rst' % name, writer=manpage.Writer()) with open('docs/man/%s.1' % name, 'wb') as fd: fd.write(man_page) From 248c408b5b68384ae60704d9b9b25f214c39c941 Mon Sep 17 00:00:00 2001 From: Milkey Mouse Date: Sat, 25 Nov 2017 17:16:28 -0800 Subject: [PATCH 2/2] Fix build_man issues (fixes #3364) --- src/borg/archiver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 13fc3db2a..a1f24b1d3 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -3953,7 +3953,7 @@ class Archiver: R- == borg extract (extract archive, dry-run, do everything, but do not write files to disk) R-Z- == all zero files. Measuring heavily duplicated files. R-R- == random files. No duplication here, measuring throughput through all processing - stages, except writing to disk. + stages, except writing to disk. U- == borg create (2nd archive creation of unchanged input files, measure files cache speed) The throughput value is kind of virtual here, it does not actually read the file.