[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> 09/03/02 18:02:58

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : eas_acls.py 

Log message:
        Don't crash when filesystem can't set ACL.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.359&r2=1.360
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/eas_acls.py?cvsroot=rdiff-backup&r1=1.42&r2=1.43

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -b -r1.359 -r1.360
--- CHANGELOG   2 Mar 2009 17:55:27 -0000       1.359
+++ CHANGELOG   2 Mar 2009 18:02:58 -0000       1.360
@@ -1,6 +1,9 @@
 New in v1.3.2 (????/??/??)
 ---------------------------
 
+Don't crash when filesystem can't set ACL. Thanks to Matt Thompson for the bug
+report. (Andrew Ferguson)
+
 Fix Security Error when performing non-backup operations on Windows. Thanks to
 Tommy Keene for the bug report. (Andrew Ferguson)
 

Index: rdiff_backup/eas_acls.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/eas_acls.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- rdiff_backup/eas_acls.py    19 Dec 2008 14:59:34 -0000      1.42
+++ rdiff_backup/eas_acls.py    2 Mar 2009 18:02:58 -0000       1.43
@@ -377,7 +377,15 @@
        assert rp.conn is Globals.local_connection
        if entry_list: acl = list_to_acl(entry_list, map_names)
        else: acl = posix1e.ACL()
+
+       try:
        acl.applyto(rp.path)
+       except IOError, exc:
+               if exc[0] == errno.EOPNOTSUPP:
+                       log.Log("Warning: unable to set ACL on %s: %s" % 
+                                       (repr(rp.path), exc), 4)
+                       return
+               else: raise
 
        if rp.isdir():
                if default_entry_list: