[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/06/23 13:49:30

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : eas_acls.py 

Log message:
        Actually make rdiff-backup robust to failure to read an ACL because the
        file cannot be found.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.278&r2=1.279
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/eas_acls.py?cvsroot=rdiff-backup&r1=1.31&r2=1.32

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -b -r1.278 -r1.279
--- CHANGELOG   23 Jun 2008 02:30:21 -0000      1.278
+++ CHANGELOG   23 Jun 2008 13:49:29 -0000      1.279
@@ -1,6 +1,9 @@
 New in v1.1.17 (????/??/??)
 ---------------------------
 
+Actually make rdiff-backup robust to failure to read an ACL because the file
+cannot be found. (Andrew Ferguson)
+
 Get makedist working on Windows. (Patch from Josh Nisly)
 
 

Index: rdiff_backup/eas_acls.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/eas_acls.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- rdiff_backup/eas_acls.py    12 Jun 2008 02:35:49 -0000      1.31
+++ rdiff_backup/eas_acls.py    23 Jun 2008 13:49:29 -0000      1.32
@@ -96,7 +96,7 @@
                except IOError, exc:
                        if exc[0] == errno.EOPNOTSUPP or exc[0] == errno.EPERM:
                                return # if not supported, consider empty
-                       if exc[0] == errno.ENOENT: # path is bad
+                       elif exc[0] == errno.ENOENT: # path is bad
                                log.Log("Warning: unable to clear xattrs on %s: 
%s" %
                                                (repr(rp.path), exc), 3)
                                return
@@ -382,8 +382,9 @@
        assert rp.conn is Globals.local_connection
        try: acl = posix1e.ACL(file=rp.path)
        except IOError, exc:
-               if exc[0] == errno.EOPNOTSUPP: acl = None
-               if exc[0] == errno.ENOENT:
+               if exc[0] == errno.EOPNOTSUPP:
+                       acl = None
+               elif exc[0] == errno.ENOENT:
                        log.Log("Warning: unable to read ACL from %s: %s"
                                        % (repr(rp.path), exc), 3)
                        acl = None
@@ -391,8 +392,9 @@
        if rp.isdir():
                try: def_acl = posix1e.ACL(filedef=rp.path)
                except IOError, exc:
-                       if exc[0] == errno.EOPNOTSUPP: def_acl = None
-                       if exc[0] == errno.ENOENT:
+                       if exc[0] == errno.EOPNOTSUPP:
+                               def_acl = None
+                       elif exc[0] == errno.ENOENT:
                                log.Log("Warning: unable to read default ACL 
from %s: %s"
                                        % (repr(rp.path), exc), 3)
                                def_acl = None