Commit 7bd20c11 authored by owsla's avatar owsla

Don't run extended attributes test if --no-eas is given


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@828 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent f9c01946
New in v1.1.13 (????/??/??) New in v1.1.13 (????/??/??)
--------------------------- ---------------------------
Don't run the extended attributes test if rdiff-backup is run with
the --no-eas option. Prevents hang in isolated cases. (Andrew Ferguson)
Don't throw an error when clearing extended attributes if they are not Don't throw an error when clearing extended attributes if they are not
supported on the file. (Andrew Ferguson) supported on the file. (Andrew Ferguson)
......
...@@ -304,6 +304,11 @@ class FSAbilities: ...@@ -304,6 +304,11 @@ class FSAbilities:
"""Set extended attributes from rp. Tests writing if write is true.""" """Set extended attributes from rp. Tests writing if write is true."""
assert Globals.local_connection is rp.conn assert Globals.local_connection is rp.conn
assert rp.lstat() assert rp.lstat()
if Globals.eas_active == 0:
log.Log("Extended attributes test skipped. rdiff-backup run "
"with --no-eas option.", 4)
self.eas = 0
return
try: import xattr try: import xattr
except ImportError: except ImportError:
log.Log("Unable to import module xattr.\nExtended attributes not " log.Log("Unable to import module xattr.\nExtended attributes not "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment