From 34a821178f2bdbbf946c915c2f2906ffc7f46816 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 13 Jun 2017 01:12:14 +0200 Subject: [PATCH] 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 0b00c14c277b6480feb476e90f7ece5cf194ceff) --- borg/archiver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/borg/archiver.py b/borg/archiver.py index 248d82c59..a0d335df2 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -486,7 +486,7 @@ class Archiver: else: if stat.S_ISDIR(item[b'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) except BackupOSError as e: @@ -496,7 +496,7 @@ class Archiver: while dirs: 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[b'path']), e) for pattern in include_patterns: