diff --git a/NEWS b/NEWS index 98bc0dbf..1b445b75 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +1.1.14.dev0 + * #49: Rename incorrect --pattern-from option to correct --patterns-from. + 1.1.13 * #54: Fix for incorrect consistency check flags passed to Borg when all three checks ("repository", "archives", and "extract") are specified in borgmatic configuration. diff --git a/borgmatic/borg/create.py b/borgmatic/borg/create.py index ea5d4deb..d21e667c 100644 --- a/borgmatic/borg/create.py +++ b/borgmatic/borg/create.py @@ -57,7 +57,7 @@ def _make_pattern_flags(location_config, pattern_filename=None): return tuple( itertools.chain.from_iterable( - ('--pattern-from', pattern_filename) + ('--patterns-from', pattern_filename) for pattern_filename in pattern_filenames ) ) diff --git a/borgmatic/tests/unit/borg/test_create.py b/borgmatic/tests/unit/borg/test_create.py index c788fda5..5299f89b 100644 --- a/borgmatic/tests/unit/borg/test_create.py +++ b/borgmatic/tests/unit/borg/test_create.py @@ -84,7 +84,7 @@ def test_make_pattern_flags_includes_pattern_filename_when_given(): pattern_filename='/tmp/patterns', ) - assert pattern_flags == ('--pattern-from', '/tmp/patterns') + assert pattern_flags == ('--patterns-from', '/tmp/patterns') def test_make_pattern_flags_includes_patterns_from_filenames_when_in_config(): @@ -92,7 +92,7 @@ def test_make_pattern_flags_includes_patterns_from_filenames_when_in_config(): location_config={'patterns_from': ['patterns', 'other']}, ) - assert pattern_flags == ('--pattern-from', 'patterns', '--pattern-from', 'other') + assert pattern_flags == ('--patterns-from', 'patterns', '--patterns-from', 'other') def test_make_pattern_flags_includes_both_filenames_when_patterns_given_and_patterns_from_in_config(): @@ -101,7 +101,7 @@ def test_make_pattern_flags_includes_both_filenames_when_patterns_given_and_patt pattern_filename='/tmp/patterns', ) - assert pattern_flags == ('--pattern-from', 'patterns', '--pattern-from', '/tmp/patterns') + assert pattern_flags == ('--patterns-from', 'patterns', '--patterns-from', '/tmp/patterns') def test_make_pattern_flags_considers_none_patterns_from_filenames_as_empty(): diff --git a/setup.py b/setup.py index b7ed1033..37b61c6a 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages -VERSION = '1.1.13' +VERSION = '1.1.14.dev0' setup(