summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-03-08 19:51:34 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-03-08 19:51:34 +0000
commit81e5644f932698a1daeef44f2f85b5f7dba3e4da (patch)
treef561650e34f412a731fe1b1b1e7bc4889147c431 /rdiff-backup/rdiff_backup
parent063c43473f2c93be0250a876bf3cd6f65a3370ec (diff)
downloadrdiff-backup-81e5644f932698a1daeef44f2f85b5f7dba3e4da.tar.gz
Don't crash on zlib errors.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@1042 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup')
-rw-r--r--rdiff-backup/rdiff_backup/robust.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py
index c276b6b..f3043d8 100644
--- a/rdiff-backup/rdiff_backup/robust.py
+++ b/rdiff-backup/rdiff_backup/robust.py
@@ -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