From af5cc31af241c3c674b9072e7a652c202cb9ac2c Mon Sep 17 00:00:00 2001 From: owsla Date: Thu, 24 Apr 2008 17:08:32 +0000 Subject: Improve Unicode support when logging in eas_acls.py (Fix from Saptarshi Guha) git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@884 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/CHANGELOG | 4 ++++ rdiff-backup/rdiff_backup/eas_acls.py | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index a7dba33..62daa7a 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,10 @@ New in v1.1.16 (????/??/??) --------------------------- +Improve Unicode support by escaping Unicode characters in filenames +when printing them in log messages from eas_acls.py. (Fix from +Saptarshi Guha) + Handle Windows' lack of getuid(), getgid(), hardlinks and symlinks in fs_abilities.py. Use subproces.Popen() on Windows since it does not support os.popen2(). (Patch from Josh Nisly) diff --git a/rdiff-backup/rdiff_backup/eas_acls.py b/rdiff-backup/rdiff_backup/eas_acls.py index 92628d4..5ea570b 100644 --- a/rdiff-backup/rdiff_backup/eas_acls.py +++ b/rdiff-backup/rdiff_backup/eas_acls.py @@ -61,7 +61,7 @@ class ExtendedAttributes: if exc[0] == errno.EOPNOTSUPP or exc[0] == errno.EPERM: return # if not supported, consider empty if exc[0] == errno.EACCES: - log.Log("Warning: listattr(%s): %s" % (rp.path, exc), 3) + log.Log("Warning: listattr(%s): %s" % (repr(rp.path), exc), 3) return raise for attr in attr_list: @@ -90,7 +90,7 @@ class ExtendedAttributes: # to bail out or be too noisy at low log levels. if exc[0] == errno.EACCES: log.Log("Warning: unable to remove xattr %s from %s" - % (name, rp.path), 7) + % (name, repr(rp.path)), 7) continue else: raise except IOError, exc: @@ -109,7 +109,7 @@ class ExtendedAttributes: # fail gracefully if can't call setxattr if exc[0] == errno.EOPNOTSUPP or exc[0] == errno.EACCES: log.Log("Warning: unable to write xattr %s to %s" - % (name, rp.path), 6) + % (name, repr(rp.path)), 6) continue else: raise -- cgit v1.2.1