mirror of https://github.com/borgbackup/borg.git
simplify: read_data param of io.read() is not used (yet)
This commit is contained in:
parent
b64427c480
commit
74ffceabf4
|
@ -1653,13 +1653,13 @@ class LoggedIO:
|
||||||
h.update(d)
|
h.update(d)
|
||||||
return h.digest()
|
return h.digest()
|
||||||
|
|
||||||
def read(self, segment, offset, id, read_data=True, *, expected_size=None):
|
def read(self, segment, offset, id, *, read_data=True, expected_size=None):
|
||||||
"""
|
"""
|
||||||
Read entry from *segment* at *offset* with *id*.
|
Read entry from *segment* at *offset* with *id*.
|
||||||
If read_data is False the size of the entry is returned instead.
|
|
||||||
|
|
||||||
See the _read() docstring about confidence in the returned data.
|
See the _read() docstring about confidence in the returned data.
|
||||||
"""
|
"""
|
||||||
|
assert read_data is True # False is not used (yet)
|
||||||
if segment == self.segment and self._write_fd:
|
if segment == self.segment and self._write_fd:
|
||||||
self._write_fd.sync()
|
self._write_fd.sync()
|
||||||
fd = self.get_fd(segment)
|
fd = self.get_fd(segment)
|
||||||
|
@ -1675,7 +1675,7 @@ class LoggedIO:
|
||||||
raise IntegrityError(
|
raise IntegrityError(
|
||||||
f"size from repository index: {expected_size} != " f"size from entry header: {data_size_from_header}"
|
f"size from repository index: {expected_size} != " f"size from entry header: {data_size_from_header}"
|
||||||
)
|
)
|
||||||
return data if read_data else data_size_from_header
|
return data
|
||||||
|
|
||||||
def _read(self, fd, header, segment, offset, acceptable_tags, read_data=True):
|
def _read(self, fd, header, segment, offset, acceptable_tags, read_data=True):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue