summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup/rpath.py
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2003-07-19 18:28:25 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2003-07-19 18:28:25 +0000
commit318878a9b7bc3bd03f18f33aa42257c3d457c7f7 (patch)
tree046f28d3bd470350eccfce5fe0175623630f9359 /rdiff-backup/rdiff_backup/rpath.py
parentbd8c21e288b4268ae59ef2ac2eb5824d4f3e2b8c (diff)
downloadrdiff-backup-318878a9b7bc3bd03f18f33aa42257c3d457c7f7.tar.gz
May have fixed recursion bug in resource forks; added another test
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@348 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/rpath.py')
-rw-r--r--rdiff-backup/rdiff_backup/rpath.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py
index 8308b87..2ad52bd 100644
--- a/rdiff-backup/rdiff_backup/rpath.py
+++ b/rdiff-backup/rdiff_backup/rpath.py
@@ -1021,13 +1021,16 @@ class RPath(RORPath):
assert self.isreg()
try: rfork = self.data['resourcefork']
except KeyError:
- rfork = self.append('rsrc').get_data()
+ rfork_fp = self.conn.open(os.path.join(self.path, 'rsrc'), 'rb')
+ rfork = rfork_fp.read()
+ assert not rfork_fp.close()
self.data['resourcefork'] = rfork
return rfork
def write_resource_fork(self, rfork_data):
"""Write new resource fork to self"""
- fp = self.append('rsrc').open('wb')
+ log.Log("Writing resource fork to %s" % (self.index,), 7)
+ fp = self.conn.open(os.path.join(self.path, 'rsrc'), 'wb')
fp.write(rfork_data)
assert not fp.close()