diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2009-03-08 19:51:20 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2009-03-08 19:51:20 +0000 |
| commit | 9c788ff425eddfb847e657b9f337bd3761d86d5e (patch) | |
| tree | ce71a0ffe29195732260e2ea6984b7ba3a0393bb | |
| parent | 7f4a4fcc41ae2690fcec2c86db01bc1e8ac18aa1 (diff) | |
| download | rdiff-backup-9c788ff425eddfb847e657b9f337bd3761d86d5e.tar.gz | |
Don't crash on zlib errors
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-2@1041 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 9066c7e..a4436df 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,8 @@ 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) diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py index c276b6b..e33f421 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 |