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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/06/12 02:35:49

Modified files:
        rdiff_backup   : eas_acls.py 

Log message:
        Whoops. There is no such thing as a 'ListError' in python -- was 
confused
        by a traceback message.

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

Patches:
Index: eas_acls.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/eas_acls.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- eas_acls.py 11 Jun 2008 20:10:58 -0000      1.30
+++ eas_acls.py 12 Jun 2008 02:35:49 -0000      1.31
@@ -57,7 +57,7 @@
        def read_from_rp(self, rp):
                """Set the extended attributes from an rpath"""
                try: attr_list = rp.conn.xattr.listxattr(rp.path)
-               except (IOError, ListError), exc:
+               except IOError, exc:
                        if exc[0] == errno.EOPNOTSUPP or exc[0] == errno.EPERM:
                                return # if not supported, consider empty
                        if exc[0] == errno.EACCES or exc[0] == errno.ENOENT:
@@ -93,7 +93,7 @@
                                                        % (name, 
repr(rp.path)), 7)
                                                continue
                                        else: raise
-               except (IOError, ListError), exc:
+               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
@@ -108,7 +108,7 @@
                for (name, value) in self.attr_dict.iteritems():
                        try:
                                rp.conn.xattr.setxattr(rp.path, name, value)
-                       except (IOError, ListError), exc:
+                       except IOError, exc:
                                # Mac and Linux attributes have different 
namespaces, so
                                # fail gracefully if can't call setxattr
                                if exc[0] == errno.EOPNOTSUPP or exc[0] == 
errno.EACCES \
@@ -381,7 +381,7 @@
        """Returns (acl_list, def_acl_list) from an rpath.  Call locally"""
        assert rp.conn is Globals.local_connection
        try: acl = posix1e.ACL(file=rp.path)
-       except (IOError, ListError), exc:
+       except IOError, exc:
                if exc[0] == errno.EOPNOTSUPP: acl = None
                if exc[0] == errno.ENOENT:
                        log.Log("Warning: unable to read ACL from %s: %s"
@@ -390,7 +390,7 @@
                else: raise
        if rp.isdir():
                try: def_acl = posix1e.ACL(filedef=rp.path)
-               except (IOError, ListError), exc:
+               except IOError, exc:
                        if exc[0] == errno.EOPNOTSUPP: def_acl = None
                        if exc[0] == errno.ENOENT:
                                log.Log("Warning: unable to read default ACL 
from %s: %s"