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

Merge pull request #4216 from ThomasWaldmann/fwd-ports 

Fwd ports
This commit is contained in:
TW 2018-12-15 22:41:05 +01:00 committed by GitHub
parent 1c4a231a17 15695205a1
commit 9e05bf9cde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Vagrantfile vendored
View File

@ -111,7 +111,8 @@ def install_pythons(boxname)
. ~/.bash_profile . ~/.bash_profile
pyenv install 3.7.0 # tests pyenv install 3.7.0 # tests
pyenv install 3.6.0 # tests pyenv install 3.6.0 # tests
pyenv install 3.6.6 # binary build, use latest 3.6.x release pyenv install 3.5.0 # tests
pyenv install 3.6.7 # binary build, use latest 3.6.x release
pyenv rehash pyenv rehash
EOF EOF
end end
@ -129,8 +130,8 @@ def build_pyenv_venv(boxname)
. ~/.bash_profile . ~/.bash_profile
cd /vagrant/borg cd /vagrant/borg
# use the latest 3.6 release # use the latest 3.6 release
pyenv global 3.6.6 pyenv global 3.6.7
pyenv virtualenv 3.6.6 borg-env pyenv virtualenv 3.6.7 borg-env
ln -s ~/.pyenv/versions/borg-env . ln -s ~/.pyenv/versions/borg-env .
EOF EOF
end end
@ -190,8 +191,8 @@ def run_tests(boxname)
. ../borg-env/bin/activate . ../borg-env/bin/activate
if which pyenv 2> /dev/null; then if which pyenv 2> /dev/null; then
# for testing, use the earliest point releases of the supported python versions: # for testing, use the earliest point releases of the supported python versions:
pyenv global 3.6.0 3.7.0 pyenv global 3.5.0 3.6.0 3.7.0
pyenv local 3.6.0 3.7.0 pyenv local 3.5.0 3.6.0 3.7.0
fi fi
# otherwise: just use the system python # otherwise: just use the system python
if which fakeroot 2> /dev/null; then if which fakeroot 2> /dev/null; then

4
src/borg/platform/linux.pyx
View File

@ -273,6 +273,10 @@ def acl_set(path, item, numeric_owner=False, fd=None):
cdef acl_t access_acl = NULL cdef acl_t access_acl = NULL
cdef acl_t default_acl = NULL cdef acl_t default_acl = NULL
if stat.S_ISLNK(item.get('mode', 0)):
# Linux does not support setting ACLs on symlinks
return
if fd is None and isinstance(path, str): if fd is None and isinstance(path, str):
path = os.fsencode(path) path = os.fsencode(path)
if numeric_owner: if numeric_owner: