[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/eas_acls.py...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/09/26 23:13:18

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : eas_acls.py rpath.py 

Log message:
        On Mac OS X, read the com.apple.FinderInfo extended attribute since it 
is the
        only storage location for the 'busy' (Z) Finder attribute.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.303&r2=1.304
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/eas_acls.py?cvsroot=rdiff-backup&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/rpath.py?cvsroot=rdiff-backup&r1=1.126&r2=1.127

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -b -r1.303 -r1.304
--- CHANGELOG   25 Sep 2008 16:42:25 -0000      1.303
+++ CHANGELOG   26 Sep 2008 23:13:18 -0000      1.304
@@ -1,6 +1,9 @@
 New in v1.2.2 (????/??/??)
 ---------------------------
 
+On Mac OS X, read the com.apple.FinderInfo extended attribute since it is the
+only storage location for the 'busy' (Z) Finder attribute. (Andrew Ferguson)
+
 Properly fix "AttributeError: RPath instance has no attribute 'inc_compressed'"
 bug. Fix in 1.1.12 was in correct place, but wrong solution. (Andrew Ferguson)
 

Index: rdiff_backup/eas_acls.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/eas_acls.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- rdiff_backup/eas_acls.py    22 Jul 2008 16:47:10 -0000      1.35
+++ rdiff_backup/eas_acls.py    26 Sep 2008 23:13:18 -0000      1.36
@@ -68,9 +68,8 @@
                        if attr.startswith('system.'):
                                # Do not preserve system extended attributes
                                continue
-                       if not rp.isdir() and attr == 'com.apple.FinderInfo' or 
attr == 'com.apple.ResourceFork':
-                               # FinderInfo and Resource Fork handled 
elsewhere, except
-                               # for directories
+                       if not rp.isdir() and attr == 'com.apple.ResourceFork':
+                               # Resource Fork handled elsewhere, except for 
directories
                                continue
                        try: self.attr_dict[attr] = 
rp.conn.xattr.getxattr(rp.path, attr)
                        except IOError, exc:

Index: rdiff_backup/rpath.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- rdiff_backup/rpath.py       22 Jul 2008 17:46:59 -0000      1.126
+++ rdiff_backup/rpath.py       26 Sep 2008 23:13:18 -0000      1.127
@@ -1455,6 +1455,10 @@
 
 def carbonfile_get(rpath):
        """Return carbonfile value for local rpath"""
+       # Note, after we drop support for Mac OS X 10.0 - 10.3, it will no 
longer
+       # be necessary to read the finderinfo struct since it is a strict subset
+       # of the data stored in the com.apple.FinderInfo extended attribute
+       # introduced in 10.4. Indeed, FSpGetFInfo() is deprecated on 10.4.
        from Carbon.File import FSSpec
        from Carbon.File import FSRef
        import Carbon.Files