diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-07-19 20:03:28 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-07-19 20:03:28 +0000 |
commit | c5d85b7ce70b0bcc93729d6811f7297ad1294023 (patch) | |
tree | 658a6f5f8e6bb026b2a21a61d711a9dd77ec81d8 /rdiff-backup/rdiff_backup/fs_abilities.py | |
parent | d98745e56f9d52c4c689e04c8303bd9b24ded8b4 (diff) | |
download | rdiff-backup-c5d85b7ce70b0bcc93729d6811f7297ad1294023.tar.gz |
More fixes from Daniel Hazelbaker, mostly related to resource forks
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@350 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/fs_abilities.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/fs_abilities.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py index 5149c4d..36603ef 100644 --- a/rdiff-backup/rdiff_backup/fs_abilities.py +++ b/rdiff-backup/rdiff_backup/fs_abilities.py @@ -27,7 +27,7 @@ FSAbilities object describing it. """ -import errno +import errno, os import Globals, log, TempFile, selection class FSAbilities: @@ -284,18 +284,17 @@ rdiff-backup-data/chars_to_quote. """Test for resource forks by writing to regular_file/rsrc""" reg_rp = dir_rp.append('regfile') reg_rp.touch() - rfork = reg_rp.append('rsrc') - assert not rfork.lstat() s = 'test string---this should end up in resource fork' try: - fp_write = rfork.open('wb') + fp_write = reg_rp.conn.open(os.path.join(reg_rp.path, 'rsrc'), + 'wb') fp_write.write(s) assert not fp_write.close() - fp_read = rfork.open('rb') + fp_read = reg_rp.conn.open(os.path.join(reg_rp.path, 'rsrc'), 'rb') s_back = fp_read.read() - assert not fp.read.close() + assert not fp_read.close() except (OSError, IOError), e: self.resource_forks = 0 else: self.resource_forks = (s_back == s) reg_rp.delete() |