mirror of https://github.com/borgbackup/borg.git
don't write to disk with --stdout, fixes #2645
if we always give stdout to extract_item(), it gets into the stdout-
processing branch which only emits data from items that have chunks
and does nothing for items which don't.
(cherry picked from commit 0b00c14c27
)
This commit is contained in:
parent
7846ef2e69
commit
34a821178f
|
@ -486,7 +486,7 @@ class Archiver:
|
||||||
else:
|
else:
|
||||||
if stat.S_ISDIR(item[b'mode']):
|
if stat.S_ISDIR(item[b'mode']):
|
||||||
dirs.append(item)
|
dirs.append(item)
|
||||||
archive.extract_item(item, restore_attrs=False)
|
archive.extract_item(item, stdout=stdout, restore_attrs=False)
|
||||||
else:
|
else:
|
||||||
archive.extract_item(item, stdout=stdout, sparse=sparse)
|
archive.extract_item(item, stdout=stdout, sparse=sparse)
|
||||||
except BackupOSError as e:
|
except BackupOSError as e:
|
||||||
|
@ -496,7 +496,7 @@ class Archiver:
|
||||||
while dirs:
|
while dirs:
|
||||||
dir_item = dirs.pop(-1)
|
dir_item = dirs.pop(-1)
|
||||||
try:
|
try:
|
||||||
archive.extract_item(dir_item)
|
archive.extract_item(dir_item, stdout=stdout)
|
||||||
except BackupOSError as e:
|
except BackupOSError as e:
|
||||||
self.print_warning('%s: %s', remove_surrogates(dir_item[b'path']), e)
|
self.print_warning('%s: %s', remove_surrogates(dir_item[b'path']), e)
|
||||||
for pattern in include_patterns:
|
for pattern in include_patterns:
|
||||||
|
|
Loading…
Reference in New Issue