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

borg mount: support --consider-part-files correctly, fixes #3347 

(cherry picked from commit caece370b8)
This commit is contained in:
Thomas Waldmann 2017-11-22 15:08:08 +01:00
parent 0e07647576
commit 47d16e0f62
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/borg/fuse.py
View File

@ -119,7 +119,7 @@ class ItemCache:
else: else:
raise ValueError('Invalid entry type in self.meta') raise ValueError('Invalid entry type in self.meta')
def iter_archive_items(self, archive_item_ids, filter=None): def iter_archive_items(self, archive_item_ids, filter=None, consider_part_files=False):
unpacker = msgpack.Unpacker() unpacker = msgpack.Unpacker()
# Current offset in the metadata stream, which consists of all metadata chunks glued together # Current offset in the metadata stream, which consists of all metadata chunks glued together
@ -163,7 +163,7 @@ class ItemCache:
break break
item = Item(internal_dict=item) item = Item(internal_dict=item)
if filter and not filter(item): if filter and not filter(item) or not consider_part_files and 'part' in item:
msgpacked_bytes = b'' msgpacked_bytes = b''
continue continue
@ -342,7 +342,8 @@ class FuseOperations(llfuse.Operations):
hardlink_masters[item.get('path')] = (item.get('chunks'), None) hardlink_masters[item.get('path')] = (item.get('chunks'), None)
filter = Archiver.build_filter(matcher, peek_and_store_hardlink_masters, strip_components) filter = Archiver.build_filter(matcher, peek_and_store_hardlink_masters, strip_components)
for item_inode, item in self.cache.iter_archive_items(archive.metadata.items, filter=filter): for item_inode, item in self.cache.iter_archive_items(archive.metadata.items, filter=filter,
consider_part_files=self.args.consider_part_files):
if strip_components: if strip_components:
item.path = os.sep.join(item.path.split(os.sep)[strip_components:]) item.path = os.sep.join(item.path.split(os.sep)[strip_components:])
path = os.fsencode(item.path) path = os.fsencode(item.path)