mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-30 19:21:17 +00:00
Code Issues Releases Wiki Activity

fixup rename

Browse source
This commit is contained in:
Marian Beermann 2016-07-03 23:57:55 +02:00
parent 26bf500566
commit 7db952ab7f
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
borg/archive.py
View file

@ -67,7 +67,7 @@ def backup_io():
raise BackupOSError(os_error) from os_error raise BackupOSError(os_error) from os_error
def input_io_iter(iterator): def backup_io_iter(iterator):
while True: while True:
try: try:
with backup_io(): with backup_io():
@ -552,7 +552,7 @@ def process_stdin(self, path, cache):
uid, gid = 0, 0 uid, gid = 0, 0
fd = sys.stdin.buffer # binary fd = sys.stdin.buffer # binary
chunks = [] chunks = []
for chunk in input_io_iter(self.chunker.chunkify(fd)): for chunk in backup_io_iter(self.chunker.chunkify(fd)):
chunks.append(cache.add_chunk(self.key.id_hash(chunk), chunk, self.stats)) chunks.append(cache.add_chunk(self.key.id_hash(chunk), chunk, self.stats))
self.stats.nfiles += 1 self.stats.nfiles += 1
t = int_to_bigint(int(time.time()) * 1000000000) t = int_to_bigint(int(time.time()) * 1000000000)
@ -604,7 +604,7 @@ def process_file(self, path, st, cache, ignore_inode=False):
fh = Archive._open_rb(path) fh = Archive._open_rb(path)
with os.fdopen(fh, 'rb') as fd: with os.fdopen(fh, 'rb') as fd:
chunks = [] chunks = []
for chunk in input_io_iter(self.chunker.chunkify(fd, fh)): for chunk in backup_io_iter(self.chunker.chunkify(fd, fh)):
chunks.append(cache.add_chunk(self.key.id_hash(chunk), chunk, self.stats)) chunks.append(cache.add_chunk(self.key.id_hash(chunk), chunk, self.stats))
if self.show_progress: if self.show_progress:
self.stats.show_progress(item=item, dt=0.2) self.stats.show_progress(item=item, dt=0.2)

6
borg/testsuite/archive.py
View file

@ -5,7 +5,7 @@
import pytest import pytest
from ..archive import Archive, CacheChunkBuffer, RobustUnpacker, valid_msgpacked_dict, ITEM_KEYS from ..archive import Archive, CacheChunkBuffer, RobustUnpacker, valid_msgpacked_dict, ITEM_KEYS
from ..archive import BackupOSError, backup_io, input_io_iter from ..archive import BackupOSError, backup_io, backup_io_iter
from ..key import PlaintextKey from ..key import PlaintextKey
from ..helpers import Manifest from ..helpers import Manifest
from . import BaseTestCase from . import BaseTestCase
@ -164,9 +164,9 @@ def __next__(self):
oserror_iterator = Iterator(OSError) oserror_iterator = Iterator(OSError)
with pytest.raises(BackupOSError): with pytest.raises(BackupOSError):
for _ in input_io_iter(oserror_iterator): for _ in backup_io_iter(oserror_iterator):
pass pass
normal_iterator = Iterator(StopIteration) normal_iterator = Iterator(StopIteration)
for _ in input_io_iter(normal_iterator): for _ in backup_io_iter(normal_iterator):
assert False, 'StopIteration handled incorrectly' assert False, 'StopIteration handled incorrectly'