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

Merge pull request #733 from ipha/master 

Unpack file stats before passing to fuse
This commit is contained in:
TW 2016-03-10 22:35:25 +01:00
parent ec0e1553d6 353774973e
commit 95f928699b
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
borg/fuse.py
View File

@ -7,7 +7,7 @@ import stat
import tempfile import tempfile
import time import time
from .archive import Archive from .archive import Archive
from .helpers import daemonize from .helpers import daemonize, bigint_to_int
from distutils.version import LooseVersion from distutils.version import LooseVersion
import msgpack import msgpack
@ -164,13 +164,25 @@ class FuseOperations(llfuse.Operations):
entry.st_blocks = dsize / 512 entry.st_blocks = dsize / 512
# note: older archives only have mtime (not atime nor ctime) # note: older archives only have mtime (not atime nor ctime)
if have_fuse_xtime_ns: if have_fuse_xtime_ns:
entry.st_atime_ns = item.get(b'atime') or item[b'mtime'] entry.st_mtime_ns = bigint_to_int(item[b'mtime'])
entry.st_mtime_ns = item[b'mtime'] if b'atime' in item:
entry.st_ctime_ns = item.get(b'ctime') or item[b'mtime'] entry.st_atime_ns = bigint_to_int(item[b'atime'])
else:
entry.st_atime_ns = bigint_to_int(item[b'mtime'])
if b'ctime' in item:
entry.st_ctime_ns = bigint_to_int(item[b'ctime'])
else:
entry.st_ctime_ns = bigint_to_int(item[b'mtime'])
else: else:
entry.st_atime = (item.get(b'atime') or item[b'mtime']) / 1e9 entry.st_mtime_ns = bigint_to_int(item[b'mtime']) / 1e9
entry.st_mtime = item[b'mtime'] / 1e9 if b'atime' in item:
entry.st_ctime = (item.get(b'ctime') or item[b'mtime']) / 1e9 entry.st_atime_ns = bigint_to_int(item[b'atime']) / 1e9
else:
entry.st_atime_ns = bigint_to_int(item[b'mtime']) / 1e9
if b'ctime' in item:
entry.st_ctime_ns = bigint_to_int(item[b'ctime']) / 1e9
else:
entry.st_ctime_ns = bigint_to_int(item[b'mtime']) / 1e9
return entry return entry
def listxattr(self, inode, ctx=None): def listxattr(self, inode, ctx=None):