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@596 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

trunk/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)
 ---------------------------

trunk/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():