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

Fix store and cache dir auto ignore

Browse source
This commit is contained in:
Jonas Borgström 2011-01-04 23:16:55 +01:00
parent 366d4ac8c1
commit 731af5414a
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
darc/archiver.py
View file

@ -60,25 +60,25 @@ class Archiver(object):
archive = Archive(store, keychain)
cache = Cache(store, keychain)
# Add darc cache dir to inode_skip list
skip_inodes = []
skip_inodes = set()
try:
st = os.stat(Cache.cache_dir_path())
skip_inodes.append((st.st_ino, st.st_dev))
skip_inodes.add((st.st_ino, st.st_dev))
except IOError:
pass
# Add local store dir to inode_skip list
if not args.archive.host:
try:
st = os.stat(args.archive.path)
skip_inodes.append((st.st_ino, st.st_dev))
skip_inodes.add((st.st_ino, st.st_dev))
except IOError:
pass
for path in args.paths:
self._process(archive, cache, args.patterns, unicode(path))
self._process(archive, cache, args.patterns, skip_inodes, unicode(path))
archive.save(args.archive.archive, cache)
return self.exit_code
def _process(self, archive, cache, patterns, path):
def _process(self, archive, cache, patterns, skip_inodes, path):
if exclude_path(path, patterns):
return
try:
@ -86,6 +86,8 @@ class Archiver(object):
except OSError, e:
self.print_error('%s: %s', path, e)
return
if (st.st_ino, st.st_dev) in skip_inodes:
return
self.print_verbose(path)
if stat.S_ISDIR(st.st_mode):
archive.process_dir(path, st)
@ -95,7 +97,7 @@ class Archiver(object):
self.print_error('%s: %s', path, e)
else:
for filename in entries:
self._process(archive, cache, patterns,
self._process(archive, cache, patterns, skip_inodes,
os.path.join(path, filename))
elif stat.S_ISLNK(st.st_mode):
archive.process_symlink(path, st)

2
darc/cache.py
View file

@ -85,6 +85,8 @@ class Cache(object):
def commit(self):
"""Commit transaction
"""
if not self.txn_active:
return
with open(os.path.join(self.path, 'files'), 'wb') as fd:
for item in self.files.iteritems():
msgpack.pack(item, fd)