diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2009-03-08 19:51:34 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2009-03-08 19:51:34 +0000 |
| commit | 81e5644f932698a1daeef44f2f85b5f7dba3e4da (patch) | |
| tree | f561650e34f412a731fe1b1b1e7bc4889147c431 | |
| parent | 063c43473f2c93be0250a876bf3cd6f65a3370ec (diff) | |
| download | rdiff-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
| -rw-r--r-- | rdiff-backup/CHANGELOG | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/robust.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 59fe575..372fb98 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,8 @@ New in v1.3.3 (????/??/??) --------------------------- +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) 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 |