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

minor fixes

This commit is contained in:
Thomas Waldmann 2021-06-10 12:19:20 +02:00
parent ab1757edab
commit b0af91837d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/borg/archive.py
View File

@ -1421,11 +1421,11 @@ class TarfileObjectProcessors:
return status
def process_fifo(self, *, tarinfo, status, type):
with self.create_helper(tarinfo, status, type) as (item, status): # fifo
with self.create_helper(tarinfo, status, type) as (item, status):
return status
def process_dev(self, *, tarinfo, status, type):
with self.create_helper(tarinfo, status, type) as (item, status): # char/block device
with self.create_helper(tarinfo, status, type) as (item, status):
item.rdev = os.makedev(tarinfo.devmajor, tarinfo.devminor)
return status

8
src/borg/archiver.py
View File

@ -52,7 +52,7 @@ try:
from .helpers import PrefixSpec, GlobSpec, CommentSpec, SortBySpec, FilesCacheMode
from .helpers import BaseFormatter, ItemFormatter, ArchiveFormatter
from .helpers import format_timedelta, format_file_size, parse_file_size, format_archive
from .helpers import safe_encode, remove_surrogates, bin_to_hex, prepare_dump_dict, eval_escapes, make_path_safe
from .helpers import safe_encode, remove_surrogates, bin_to_hex, prepare_dump_dict, eval_escapes
from .helpers import interval, prune_within, prune_split, PRUNING_PATTERNS
from .helpers import timestamp
from .helpers import get_cache_dir, os_stat
@ -1713,6 +1713,9 @@ class Archiver:
self._import_tar(args, repository, manifest, key, cache, tar)
# This does not close the fileobj (tarstream) we passed to it -- a side effect of the | mode.
tar.close()
if filter:
logger.debug('Done creating archive, waiting for filter to die...')
rc = filterproc.wait()
@ -1768,9 +1771,8 @@ class Archiver:
elif tarinfo.isfifo():
status = tfo.process_fifo(tarinfo=tarinfo, status='f', type=stat.S_IFIFO)
else:
# TODO: GNUTYPE_SPARSE?
status = 'E'
self.print_warning('%s: Unsupported tar type %s', tarinfo.name, tarinfo.type)
self.print_warning('%s: Unsupported tarinfo type %s', tarinfo.name, tarinfo.type)
self.print_file_status(status, tarinfo.name)
if args.progress: