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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Branch:         r1-2
Changes by:     Andrew Ferguson <owsla> 09/03/02 18:03:13

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : eas_acls.py 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.338.2.9&r2=1.338.2.10
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/eas_acls.py?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.42&r2=1.42.2.1

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.338.2.9
retrieving revision 1.338.2.10
diff -u -b -r1.338.2.9 -r1.338.2.10
--- CHANGELOG   2 Mar 2009 17:25:53 -0000       1.338.2.9
+++ CHANGELOG   2 Mar 2009 18:03:09 -0000       1.338.2.10
@@ -1,6 +1,9 @@
 New in v1.2.7 (????/??/??)
 ---------------------------
 
+Don't crash when filesystem can't set ACL. Thanks to Matt Thompson for the bug
+report. (Andrew Ferguson)
+
 Properly disable hardlinks by default on Windows.
 
 Fix Python 2.2 compatibility. Closes Savannah bug #25529. (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.42.2.1
diff -u -b -r1.42 -r1.42.2.1
--- rdiff_backup/eas_acls.py    19 Dec 2008 14:59:34 -0000      1.42
+++ rdiff_backup/eas_acls.py    2 Mar 2009 18:03:11 -0000       1.42.2.1
@@ -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: