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

make sure hardlink copy doesn't break perms

This commit is contained in:
Antoine Beaupré 2015-10-15 19:01:22 -04:00
parent 4be9c29d0d
commit 34d0e0641c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
borg/testsuite/upgrader.py
View File

@ -14,6 +14,7 @@ except ImportError:
from ..upgrader import AtticRepositoryUpgrader, AtticKeyfileKey from ..upgrader import AtticRepositoryUpgrader, AtticKeyfileKey
from ..helpers import get_keys_dir from ..helpers import get_keys_dir
from ..key import KeyfileKey from ..key import KeyfileKey
from ..remote import RemoteRepository
from ..repository import Repository, MAGIC from ..repository import Repository, MAGIC
@ -158,10 +159,14 @@ def test_convert_all(tmpdir, attic_repo, attic_key_file, inplace):
""" """
# check should fail because of magic number # check should fail because of magic number
assert not repo_valid(tmpdir) assert not repo_valid(tmpdir)
def stat_segment(path):
return os.stat(os.path.join(path, 'data', '0', '0'))
def first_inode(path): def first_inode(path):
return os.stat(os.path.join(path, 'data', '0', '0')).st_ino return stat_segment(path).st_ino
orig_inode = first_inode(attic_repo.path) orig_inode = first_inode(attic_repo.path)
repo = AtticRepositoryUpgrader(str(tmpdir), create=False) repo = AtticRepositoryUpgrader(str(tmpdir), create=False)
# replicate command dispatch, partly
os.umask(attic_repo.umask)
backup = repo.upgrade(dryrun=False, inplace=inplace) backup = repo.upgrade(dryrun=False, inplace=inplace)
if inplace: if inplace:
assert backup is None assert backup is None
@ -169,6 +174,9 @@ def test_convert_all(tmpdir, attic_repo, attic_key_file, inplace):
else: else:
assert backup assert backup
assert first_inode(repo.path) != first_inode(backup) assert first_inode(repo.path) != first_inode(backup)
# i have seen cases where the copied tree has world-readable
# permissions, which is wrong
assert stat_segment(backup).st_mode & 0o007== 0
assert key_valid(attic_key_file.path) assert key_valid(attic_key_file.path)
assert repo_valid(tmpdir) assert repo_valid(tmpdir)