Browse Source

Archiver.build_filter: strip_components is no longer a optional parameter.

Martin Hostettler 8 năm trước cách đây
mục cha
commit
a026febdb0
2 tập tin đã thay đổi với 3 bổ sung3 xóa
  1. 1 1
      src/borg/archiver.py
  2. 2 2
      src/borg/testsuite/archiver.py

+ 1 - 1
src/borg/archiver.py

@@ -417,7 +417,7 @@ class Archiver:
         self.print_file_status(status, path)
 
     @staticmethod
-    def build_filter(matcher, peek_and_store_hardlink_masters, strip_components=0):
+    def build_filter(matcher, peek_and_store_hardlink_masters, strip_components):
         if strip_components:
             def item_filter(item):
                 peek_and_store_hardlink_masters(item)

+ 2 - 2
src/borg/testsuite/archiver.py

@@ -2210,14 +2210,14 @@ class TestBuildFilter:
     def test_basic(self):
         matcher = PatternMatcher()
         matcher.add([parse_pattern('included')], True)
-        filter = Archiver.build_filter(matcher, self.item_is_hardlink_master)
+        filter = Archiver.build_filter(matcher, self.item_is_hardlink_master, 0)
         assert filter(Item(path='included'))
         assert filter(Item(path='included/file'))
         assert not filter(Item(path='something else'))
 
     def test_empty(self):
         matcher = PatternMatcher(fallback=True)
-        filter = Archiver.build_filter(matcher, self.item_is_hardlink_master)
+        filter = Archiver.build_filter(matcher, self.item_is_hardlink_master, 0)
         assert filter(Item(path='anything'))
 
     def test_strip_components(self):