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

Merge pull request #6064 from petenewcomb/1.1-maint

Browse source 
avoid expanding path into LHS of formatting operation, see #6063
This commit is contained in:
TW 2021-11-29 11:28:50 +01:00 committed by GitHub
commit f0efd4fad6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/borg/archive.py
View file

@ -778,7 +778,6 @@ Utilization of max. archive size: {csize_max:.0%}
try:
xattr.setxattr(fd or path, k, v, follow_symlinks=False)
except OSError as e:
msg_format = '%s: when setting extended attribute %s: %%s' % (path, k.decode())
if e.errno == errno.E2BIG:
err_str = 'too big for this filesystem'
elif e.errno == errno.ENOTSUP:
@ -793,7 +792,7 @@ Utilization of max. archive size: {csize_max:.0%}
# EACCES: permission denied to set this specific xattr (this may happen related to security.* keys)
# EPERM: operation not permitted
err_str = os.strerror(e.errno)
logger.warning(msg_format % err_str)
logger.warning('%s: when setting extended attribute %s: %s', path, k.decode(), err_str)
set_ec(EXIT_WARNING)
# bsdflags include the immutable flag and need to be set last:
if not self.nobsdflags and 'bsdflags' in item: