[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/fs_abilitie...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/07/17 01:53:50

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : fs_abilities.py 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.232&r2=1.233
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&r1=1.36&r2=1.37

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -b -r1.232 -r1.233
--- CHANGELOG   16 Jul 2007 17:19:53 -0000      1.232
+++ CHANGELOG   17 Jul 2007 01:53:49 -0000      1.233
@@ -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)
 

Index: rdiff_backup/fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- rdiff_backup/fs_abilities.py        10 Jul 2007 23:19:50 -0000      1.36
+++ rdiff_backup/fs_abilities.py        17 Jul 2007 01:53:49 -0000      1.37
@@ -304,6 +304,11 @@
                """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 "