From 4047076e70b5ed4d31a8045cbf3ee622be84ce00 Mon Sep 17 00:00:00 2001 From: elandorr <56206745+elandorr@users.noreply.github.com> Date: Sun, 14 May 2023 20:21:41 +0000 Subject: [PATCH 1/3] include/exclude options --- 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 23e0248a1..995139ab7 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -2972,7 +2972,7 @@ class Archiver: 'Paths with fewer elements will be silently skipped.') def define_exclusion_group(subparser, **kwargs): - exclude_group = subparser.add_argument_group('Exclusion options') + exclude_group = subparser.add_argument_group('Include/Exclude options') define_exclude_and_patterns(exclude_group.add_argument, **kwargs) return exclude_group From dedd58969c223de21f5cc4d012b79e264bbad364 Mon Sep 17 00:00:00 2001 From: elandorr <56206745+elandorr@users.noreply.github.com> Date: Sun, 14 May 2023 20:28:52 +0000 Subject: [PATCH 2/3] mention paths-from-stdin's exclusiveness --- src/borg/archiver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 995139ab7..086b1ed74 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -3582,8 +3582,8 @@ class Archiver: help='interpret PATH as command and store its stdout. See also section Reading from' ' stdin below.') subparser.add_argument('--paths-from-stdin', action='store_true', - help='read DELIM-separated list of paths to backup from stdin. Will not ' - 'recurse into directories.') + help='read DELIM-separated list of paths to backup from stdin. Exclusive option - no recursion' + ', no excludes, ``-x`` does not apply.') subparser.add_argument('--paths-from-command', action='store_true', help='interpret PATH as command and treat its output as ``--paths-from-stdin``') subparser.add_argument('--paths-delimiter', metavar='DELIM', From 8e41831f4cc5552c1c03f23cc02358886b9d1d02 Mon Sep 17 00:00:00 2001 From: elandorr <56206745+elandorr@users.noreply.github.com> Date: Mon, 15 May 2023 11:39:10 +0000 Subject: [PATCH 3/3] Update archiver.py --- src/borg/archiver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 086b1ed74..4400fc3f2 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -3582,8 +3582,8 @@ class Archiver: help='interpret PATH as command and store its stdout. See also section Reading from' ' stdin below.') subparser.add_argument('--paths-from-stdin', action='store_true', - help='read DELIM-separated list of paths to backup from stdin. Exclusive option - no recursion' - ', no excludes, ``-x`` does not apply.') + help='read DELIM-separated list of paths to backup from stdin. All control is external:' + ' it will back up all files given - no more, no less.') subparser.add_argument('--paths-from-command', action='store_true', help='interpret PATH as command and treat its output as ``--paths-from-stdin``') subparser.add_argument('--paths-delimiter', metavar='DELIM',