Merge pull request #7043 from ThomasWaldmann/misc-fixes

misc fixes

src/borg/crypto/key.py

@@ -110,6 +110,7 @@ def identify_key(manifest_data):
 
 def key_factory(repository, manifest_chunk, *, ro_cls=RepoObj):
     manifest_data = ro_cls.extract_crypted_data(manifest_chunk)
+    assert manifest_data, "manifest data must not be zero bytes long"
     return identify_key(manifest_data).detect(repository, manifest_data)
 
 

src/borg/hashindex.pyx

@@ -344,8 +344,9 @@ cdef class NSIndex1(IndexBase):  # legacy borg 1.x
             assert segment <= _MAX_VALUE, "maximum number of segments reached"
         return data != NULL
 
-    def iteritems(self, marker=None):
+    def iteritems(self, marker=None, mask=0, value=0):
         cdef const unsigned char *key
+        assert mask == 0 and value == 0, "using mask/value is not supported for old index"
         iter = NSKeyIterator1(self.key_size)
         iter.idx = self
         iter.index = self.index
@@ -356,6 +357,9 @@ cdef class NSIndex1(IndexBase):  # legacy borg 1.x
             iter.key = key - self.key_size
         return iter
 
+    def flags(self, key, mask=0xFFFFFFFF, value=None):
+        raise NotImplemented("calling .flags() is not supported for old index")
+
 
 cdef class NSKeyIterator1:  # legacy borg 1.x
     cdef NSIndex1 idx