summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup/rpath.py
diff options
context:
space:
mode:
authordgaudet <dgaudet@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-06-30 22:26:22 +0000
committerdgaudet <dgaudet@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-06-30 22:26:22 +0000
commitb1d7742ccfc4ad303ea3302d68afc3def827107d (patch)
tree77fd33906edf90a62be872a20064087128f035fc /rdiff-backup/rdiff_backup/rpath.py
parent45095583b709da53b62df05cf089956684374068 (diff)
downloadrdiff-backup-b1d7742ccfc4ad303ea3302d68afc3def827107d.tar.gz
patch#4136: OSX filename/rsrc has been deprecated for some time, and as of OSX
10.4 it causes log spam. the new proper use is filename/..namedfork/rsrc. fix from Daniel Westermann-Clark. i found mailing list evidence back at least to 2001 that this is supported in earlier versions of OSX. git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@597 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/rpath.py')
-rw-r--r--rdiff-backup/rdiff_backup/rpath.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py
index b03543c..3a292d7 100644
--- a/rdiff-backup/rdiff_backup/rpath.py
+++ b/rdiff-backup/rdiff_backup/rpath.py
@@ -1141,7 +1141,7 @@ class RPath(RORPath):
try: rfork = self.data['resourcefork']
except KeyError:
try:
- rfork_fp = self.conn.open(os.path.join(self.path, 'rsrc'),
+ rfork_fp = self.conn.open(os.path.join(self.path, '..namedfork', 'rsrc'),
'rb')
rfork = rfork_fp.read()
assert not rfork_fp.close()
@@ -1152,7 +1152,7 @@ class RPath(RORPath):
def write_resource_fork(self, rfork_data):
"""Write new resource fork to self"""
log.Log("Writing resource fork to %s" % (self.index,), 7)
- fp = self.conn.open(os.path.join(self.path, 'rsrc'), 'wb')
+ fp = self.conn.open(os.path.join(self.path, '..namedfork', 'rsrc'), 'wb')
fp.write(rfork_data)
assert not fp.close()
self.set_resource_fork(rfork_data)