diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-07-03 21:44:19 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-07-03 21:44:19 +0000 |
| commit | b364d819a227af250f9e71c854718a25919dea00 (patch) | |
| tree | 5d6c9aefe252c24ff09e8b8d1bae54b22b070b68 | |
| parent | b466bcadefdaca409b7052d433d96b304811a0b0 (diff) | |
| download | rdiff-backup-b364d819a227af250f9e71c854718a25919dea00.tar.gz | |
Catch another reasonable error when reading extended attributes.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@906 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/eas_acls.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 4b53dc1..fa1e4f2 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,8 @@ New in v1.1.17 (????/??/??) --------------------------- +Catch another reasonable error when reading EAs. (Andrew Ferguson) + Use the Python os.lstat() on Windows. (Patch from Josh Nisly) Support for Windows ACLs. (Patch from Josh Nisly and Fred Gansevles) diff --git a/rdiff-backup/rdiff_backup/eas_acls.py b/rdiff-backup/rdiff_backup/eas_acls.py index a6fac3d..5077b6a 100644 --- a/rdiff-backup/rdiff_backup/eas_acls.py +++ b/rdiff-backup/rdiff_backup/eas_acls.py @@ -58,7 +58,7 @@ class ExtendedAttributes: """Set the extended attributes from an rpath""" try: attr_list = rp.conn.xattr.listxattr(rp.path) except IOError, exc: - if exc[0] == errno.EOPNOTSUPP or exc[0] == errno.EPERM: + if exc[0] in (errno.EOPNOTSUPP, errno.EPERM, errno.ETXTBSY): return # if not supported, consider empty if exc[0] == errno.EACCES or exc[0] == errno.ENOENT: log.Log("Warning: listattr(%s): %s" % (repr(rp.path), exc), 3) |