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

Merge pull request #1344 from enkore/fix/merges 

Fix some item subscripts that came from 1.0-maint
This commit is contained in:
TW 2016-07-18 07:56:50 +02:00 committed by GitHub
parent 963bdd340c 52a72cf73a
commit a2ea1d743a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/borg/archive.py
View File

@ -429,7 +429,7 @@ Number of files: {0.stats.nfiles}'''.format(
sys.stdout.buffer.flush()
if has_damaged_chunks:
logger.warning('File %s has damaged (all-zero) chunks. Try running borg check --repair.' %
remove_surrogates(item[b'path']))
remove_surrogates(item.path))
return
original_path = original_path or item.path

4
src/borg/archiver.py
View File

@ -446,7 +446,7 @@ class Archiver:
try:
archive.extract_item(dir_item, stdout=stdout)
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.path), e)
if output_list:
logging.getLogger('borg.output.list').info(remove_surrogates(orig_path))
try:
@ -468,7 +468,7 @@ class Archiver:
try:
archive.extract_item(dir_item)
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.path), e)
for pattern in include_patterns:
if pattern.match_count == 0:
self.print_warning("Include pattern '%s' never matched.", pattern)