瀏覽代碼

49: Rename incorrect --pattern-from option to correct --patterns-from.

Dan Helfman 7 年之前
父節點
當前提交
bf2f39623e
共有 4 個文件被更改,包括 8 次插入5 次删除
  1. 3 0
      NEWS
  2. 1 1
      borgmatic/borg/create.py
  3. 3 3
      borgmatic/tests/unit/borg/test_create.py
  4. 1 1
      setup.py

+ 3 - 0
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.

+ 1 - 1
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
         )
     )

+ 3 - 3
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():

+ 1 - 1
setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '1.1.13'
+VERSION = '1.1.14.dev0'
 
 
 setup(