[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> 07/07/16 17:19:54

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : eas_acls.py 

Log message:
        Handle exception when trying to clear extended attributes on a file that
        doesn't support them.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.231&r2=1.232
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/eas_acls.py?cvsroot=rdiff-backup&r1=1.23&r2=1.24

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -b -r1.231 -r1.232
--- CHANGELOG   12 Jul 2007 07:38:16 -0000      1.231
+++ CHANGELOG   16 Jul 2007 17:19:53 -0000      1.232
@@ -1,6 +1,9 @@
 New in v1.1.13 (????/??/??)
 ---------------------------
 
+Don't throw an error when clearing extended attributes if they are not
+supported on the file. (Andrew Ferguson)
+
 
 New in v1.1.12 (2007/07/12)
 ---------------------------

Index: rdiff_backup/eas_acls.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/eas_acls.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- rdiff_backup/eas_acls.py    11 Jul 2007 16:51:44 -0000      1.23
+++ rdiff_backup/eas_acls.py    16 Jul 2007 17:19:54 -0000      1.24
@@ -81,6 +81,7 @@
 
        def clear_rp(self, rp):
                """Delete all the extended attributes in rpath"""
+               try:
                for name in rp.conn.xattr.listxattr(rp.path):
                        try:
                                rp.conn.xattr.removexattr(rp.path, name)
@@ -92,6 +93,10 @@
                                                % (name, rp.path), 7)
                                        continue
                                else: raise
+               except IOError, exc:
+                       if exc[0] == errno.EOPNOTSUPP or exc[0] == errno.EPERM:
+                               return # if not supported, consider empty
+                       else: raise
 
        def write_to_rp(self, rp):
                """Write extended attributes to rpath rp"""