Commit d9c33ba8 authored by owsla's avatar owsla

Don't crash on zlib errors


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@1041 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent 91694ff7
New in v1.2.8 (????/??/??)
---------------------------
Don't crash on zlib errors. Closes Debian bug #518531. (Andrew Ferguson)
Make sticky bit warnings quieter while determining file system abilities.
Closes Savannah bug #25788. (Andrew Ferguson)
......
......@@ -19,7 +19,7 @@
"""Catch various exceptions given system call"""
import errno, signal, exceptions
import errno, signal, exceptions, zlib
import librsync, C, static, rpath, Globals, log, statistics, connection
def check_common_error(error_handler, function, args = []):
......@@ -45,7 +45,8 @@ def check_common_error(error_handler, function, args = []):
def catch_error(exc):
"""Return true if exception exc should be caught"""
for exception_class in (rpath.SkipFileException, rpath.RPathException,
librsync.librsyncError, C.UnknownFileTypeError):
librsync.librsyncError, C.UnknownFileTypeError,
zlib.error):
if isinstance(exc, exception_class): return 1
if (isinstance(exc, EnvironmentError) and
# the invalid mode shows up in backups of /proc for some reason
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment