mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-26 07:53:58 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7043 from ThomasWaldmann/misc-fixes

Browse source 
misc fixes
This commit is contained in:
TW 2022-09-26 17:32:50 +02:00 committed by GitHub
commit 098d80f843
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/borg/crypto/key.py
View file

@ -110,6 +110,7 @@ def identify_key(manifest_data):
def key_factory(repository, manifest_chunk, *, ro_cls=RepoObj): def key_factory(repository, manifest_chunk, *, ro_cls=RepoObj):
manifest_data = ro_cls.extract_crypted_data(manifest_chunk) 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) return identify_key(manifest_data).detect(repository, manifest_data)

6
src/borg/hashindex.pyx
View file

@ -344,8 +344,9 @@ cdef class NSIndex1(IndexBase): # legacy borg 1.x
assert segment <= _MAX_VALUE, "maximum number of segments reached" assert segment <= _MAX_VALUE, "maximum number of segments reached"
return data != NULL return data != NULL
def iteritems(self, marker=None): def iteritems(self, marker=None, mask=0, value=0):
cdef const unsigned char *key 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 = NSKeyIterator1(self.key_size)
iter.idx = self iter.idx = self
iter.index = self.index iter.index = self.index
@ -356,6 +357,9 @@ cdef class NSIndex1(IndexBase): # legacy borg 1.x
iter.key = key - self.key_size iter.key = key - self.key_size
return iter 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 class NSKeyIterator1: # legacy borg 1.x
cdef NSIndex1 idx cdef NSIndex1 idx