[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/eas_acls.py

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/07/22 16:47:10

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : eas_acls.py 

Log message:
        Ignore Extended Attributes which have Unicode characters outside the 
current
        system representation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.292&r2=1.293
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/eas_acls.py?cvsroot=rdiff-backup&r1=1.34&r2=1.35

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -b -r1.292 -r1.293
--- CHANGELOG   17 Jul 2008 13:00:42 -0000      1.292
+++ CHANGELOG   22 Jul 2008 16:47:10 -0000      1.293
@@ -1,6 +1,9 @@
 New in v1.1.18 (????/??/??)
 ---------------------------
 
+Ignore Extended Attributes which have Unicode characters outside the current
+system representation. These will be correctly handled when rdiff-backup
+switches to Python 3, which will have full Unicode support. (Andrew Ferguson)
 
 
 New in v1.1.17 (2008/07/17)

Index: rdiff_backup/eas_acls.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/eas_acls.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- rdiff_backup/eas_acls.py    13 Jul 2008 19:58:55 -0000      1.34
+++ rdiff_backup/eas_acls.py    22 Jul 2008 16:47:10 -0000      1.35
@@ -150,7 +150,11 @@
                if not val: str_list.append(name)
                else:
                        encoded_val = base64.encodestring(val).replace('\n', '')
+                       try:
                        str_list.append('%s=0s%s' % (C.acl_quote(name), 
encoded_val))
+                       except UnicodeEncodeError:
+                               log.Log("Warning: unable to store Unicode 
extended attribute %s"
+                                                       % repr(name), 3)
        return '\n'.join(str_list)+'\n'
 
 def Record2EA(record):