mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2669 from ThomasWaldmann/no-extract-stdout 

don't write to disk with --stdout, fixes #2645
This commit is contained in:
enkore 2017-06-13 09:25:13 +02:00 committed by GitHub
parent 2ff880ec6e 0b00c14c27
commit f3f3710279
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/borg/archiver.py
View File

@ -704,7 +704,7 @@ class Archiver:
else:
if stat.S_ISDIR(item.mode):
dirs.append(item)
archive.extract_item(item, restore_attrs=False)
archive.extract_item(item, stdout=stdout, restore_attrs=False)
else:
archive.extract_item(item, stdout=stdout, sparse=sparse, hardlink_masters=hardlink_masters,
stripped_components=strip_components, original_path=orig_path, pi=pi)
@ -721,7 +721,7 @@ class Archiver:
pi.show()
dir_item = dirs.pop(-1)
try:
archive.extract_item(dir_item)
archive.extract_item(dir_item, stdout=stdout)
except BackupOSError as e:
self.print_warning('%s: %s', remove_surrogates(dir_item.path), e)
for pattern in matcher.get_unmatched_include_patterns():