summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rdiff-backup/CHANGELOG3
-rw-r--r--rdiff-backup/rdiff_backup/eas_acls.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 97f0c7f..47cba09 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,6 +1,9 @@
New in v1.1.10 (????/??/??)
---------------------------
+Sockets don't have extended attributes -- don't try to access them.
+(Patch from Andrew Ferguson.)
+
Fix restore from read-only bug -- rx perms on a repository directory are
enough, no need for write perms when restoring. (patch from Andrew Price)
diff --git a/rdiff-backup/rdiff_backup/eas_acls.py b/rdiff-backup/rdiff_backup/eas_acls.py
index 37694b5..ab92405 100644
--- a/rdiff-backup/rdiff_backup/eas_acls.py
+++ b/rdiff-backup/rdiff_backup/eas_acls.py
@@ -553,7 +553,7 @@ def rpath_ea_get(rp):
"""
ea = ExtendedAttributes(rp.index)
- if not rp.issym(): ea.read_from_rp(rp)
+ if not rp.issym() and not rp.issock(): ea.read_from_rp(rp)
return ea
rpath.ea_get = rpath_ea_get