diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-07-17 01:53:49 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-07-17 01:53:49 +0000 |
| commit | c0f124d8ed1585a4b852eabe0ed938b4d612b827 (patch) | |
| tree | 88aca19f8d2c13d72c5ce1cbb0f337f08399f797 | |
| parent | 3f4885e7c17d8fb1805f1113ca4799f52f976db4 (diff) | |
| download | rdiff-backup-c0f124d8ed1585a4b852eabe0ed938b4d612b827.tar.gz | |
Don't run extended attributes test if --no-eas is given
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@828 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 3 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/fs_abilities.py | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index fc7c0ad..e17b55e 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,9 @@ 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 supported on the file. (Andrew Ferguson) diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py index 32abc6c..0460fcd 100644 --- a/rdiff-backup/rdiff_backup/fs_abilities.py +++ b/rdiff-backup/rdiff_backup/fs_abilities.py @@ -304,6 +304,11 @@ class FSAbilities: """Set extended attributes from rp. Tests writing if write is true.""" assert Globals.local_connection is rp.conn 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 except ImportError: log.Log("Unable to import module xattr.\nExtended attributes not " |