diff options
| author | dgaudet <dgaudet@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-06-28 19:27:19 +0000 |
|---|---|---|
| committer | dgaudet <dgaudet@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-06-28 19:27:19 +0000 |
| commit | 45095583b709da53b62df05cf089956684374068 (patch) | |
| tree | da2b8a97ec530d344a55af91eaada5f5a5e528ea | |
| parent | e214547bd104a5853a9009f698b3b91b4c703455 (diff) | |
| download | rdiff-backup-45095583b709da53b62df05cf089956684374068.tar.gz | |
bug#12949: eliminate an exception during fs abilities testing on OS X 10.4.
fix from Daniel Westermann-Clark.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@596 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 3 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/fs_abilities.py | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index f44ca35..091e330 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -23,6 +23,9 @@ debian bug#306798: SELinux security attributes can not be removed and rdiff-backup should not fail when it fails to remove them from temp files. fix from Konrad Podloucky. +bug#12949: eliminate an exception during fs abilities testing on OS X 10.4. +fix from Daniel Westermann-Clark. + New in v0.13.6 (2005/04/07) --------------------------- diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py index 612de03..f1fcecc 100644 --- a/rdiff-backup/rdiff_backup/fs_abilities.py +++ b/rdiff-backup/rdiff_backup/fs_abilities.py @@ -241,13 +241,15 @@ rdiff-backup-data/chars_to_quote. def supports_unusual_chars(): """Test handling of several chars sometimes not supported""" for filename in [':', '\\', chr(175)]: - rp = subdir.append(filename) - try: rp.touch() - except IOError: + try: + rp = subdir.append(filename) + rp.touch() + except (IOError, OSError): assert not rp.lstat() return 0 - assert rp.lstat() - rp.delete() + else: + assert rp.lstat() + rp.delete() return 1 def sanity_check(): |