mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-24 00:37:56 +00:00
Code Issues Releases Wiki Activity

Fix exception during "attic create" with repeated files

Browse source 
Closes #39
This commit is contained in:
Jonas Borgström 2014-02-16 22:37:12 +01:00
parent 32e773c15d
commit d44fa850cd
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES
View file

@ -10,6 +10,7 @@ Version 0.11
- New "check" command for repository consistency checking (#24) - New "check" command for repository consistency checking (#24)
- Documentation improvements - Documentation improvements
- Fix exception during "attic create" with repeated files (#39)
Version 0.10 Version 0.10
------------ ------------

3
attic/cache.py
View file

@ -206,7 +206,8 @@ def file_known_and_unchanged(self, path_hash, st):
if (entry and entry[3] == st_mtime_ns(st) if (entry and entry[3] == st_mtime_ns(st)
and entry[2] == st.st_size and entry[1] == st.st_ino): and entry[2] == st.st_size and entry[1] == st.st_ino):
# reset entry age # reset entry age
self.files[path_hash][0] = 0 if entry[0] != 0:
self.files[path_hash][0] = 0
return entry[4] return entry[4]
else: else:
return None return None

5
attic/testsuite/archiver.py
View file

@ -179,6 +179,11 @@ def test_path_normalization(self):
self.assert_not_in('..', output) self.assert_not_in('..', output)
self.assert_in(' input/dir1/dir2/file', output) self.assert_in(' input/dir1/dir2/file', output)
def test_repeated_files(self):
self.create_regual_file('file1', size=1024 * 80)
self.attic('init', self.repository_location)
self.attic('create', self.repository_location + '::test', 'input', 'input')
def test_overwrite(self): def test_overwrite(self):
self.create_regual_file('file1', size=1024 * 80) self.create_regual_file('file1', size=1024 * 80)
self.create_regual_file('dir2/file2', size=1024 * 80) self.create_regual_file('dir2/file2', size=1024 * 80)