upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-05-28 04:03:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FUSE versions view: keep original file extension at end, fixes #2769

Browse source 
some tools depend on seeing the correct file extension to operate
correctly, so put our version to the left of the file extension.
This commit is contained in:
Thomas Waldmann 2017-07-02 18:11:21 +02:00
parent 5cdd0294c0
commit 51458b6b58
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/usage/mount.rst
View file

@ -22,13 +22,13 @@ Examples
root sbin srv tmp usr var
$ borg umount /tmp/mymountpoint
# The experimental versions view merges all archives in the repository
# The experimental "versions view" merges all archives in the repository
# and provides a versioned view on files.
$ borg mount -o versions /path/to/repo /tmp/mymountpoint
$ ls -l /tmp/mymountpoint/home/user/doc.txt/
total 24
-rw-rw-r-- 1 user group 12357 Aug 26 21:19 doc.txt.cda00bc9
-rw-rw-r-- 1 user group 12204 Aug 26 21:04 doc.txt.fa760f28
-rw-rw-r-- 1 user group 12357 Aug 26 21:19 doc.cda00bc9.txt
-rw-rw-r-- 1 user group 12204 Aug 26 21:04 doc.fa760f28.txt
$ borg umount /tmp/mymountpoint
borgfs

5
src/borg/fuse.py
View file

@ -351,7 +351,10 @@ class FuseOperations(llfuse.Operations):
# add intermediate directory with same name as filename
path_fname = name.rsplit(b'/', 1)
name += b'/' + path_fname[-1]
return name + os.fsencode('.%08x' % version)
# keep original extension at end to avoid confusing tools
name, ext = os.path.splitext(name)
version_enc = os.fsencode('.%08x' % version)
return name + version_enc + ext
if self.versions and not is_dir:
parent = self.process_inner(name, parent)