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

Fix test suite breakage

This commit is contained in:
Jonas Borgström 2014-06-03 22:00:34 +02:00
parent 80a2a4113f
commit 243481f6da
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
attic/cache.py
View File

@ -5,7 +5,8 @@ import os
from binascii import hexlify from binascii import hexlify
import shutil import shutil
from .helpers import Error, get_cache_dir, decode_dict, st_mtime_ns, unhexlify, UpgradableLock from .helpers import Error, get_cache_dir, decode_dict, st_mtime_ns, unhexlify, UpgradableLock, int_to_bigint, \
bigint_to_int
from .hashindex import ChunkIndex from .hashindex import ChunkIndex
@ -210,7 +211,7 @@ class Cache(object):
if not entry: if not entry:
return None return None
entry = msgpack.unpackb(entry) entry = msgpack.unpackb(entry)
if entry[1] == st.st_ino and entry[2] == st.st_size and entry[3] == st_mtime_ns(st): if entry[2] == st.st_size and bigint_to_int(entry[3]) == st_mtime_ns(st) and entry[1] == st.st_ino:
# reset entry age # reset entry age
entry[0] = 0 entry[0] = 0
self.files[path_hash] = msgpack.packb(entry) self.files[path_hash] = msgpack.packb(entry)
@ -221,5 +222,5 @@ class Cache(object):
def memorize_file(self, path_hash, st, ids): def memorize_file(self, path_hash, st, ids):
# Entry: Age, inode, size, mtime, chunk ids # Entry: Age, inode, size, mtime, chunk ids
mtime_ns = st_mtime_ns(st) mtime_ns = st_mtime_ns(st)
self.files[path_hash] = msgpack.packb((0, st.st_ino, st.st_size, mtime_ns, ids)) self.files[path_hash] = msgpack.packb((0, st.st_ino, st.st_size, int_to_bigint(mtime_ns), ids))
self._newest_mtime = max(self._newest_mtime, mtime_ns) self._newest_mtime = max(self._newest_mtime, mtime_ns)