diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-12-18 03:46:51 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-12-18 03:46:51 +0000 |
| commit | c9ee7f5cf2860c48195b6d17a7449dce4ed6caf0 (patch) | |
| tree | 57b1a66ece86e516f74ff287856638adecf0f6a6 | |
| parent | 29d4ddc44e669767406f3f0f7524f97c48f815f6 (diff) | |
| download | rdiff-backup-c9ee7f5cf2860c48195b6d17a7449dce4ed6caf0.tar.gz | |
Add ETIMEDOUT to the list of recoverable errors
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@970 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 5 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/robust.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 4bf5fd3..f2ac288 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,7 +1,10 @@ New in v1.2.3 (????/??/??) --------------------------- -Supress warnings about the deprecated sha module in Python 2.6. We'll remove +Add ETIMEDOUT to the list of recoverable errors; when irrecoverable, a +ConnectionError is raised. Closes Ubuntu bug #304659. (Andrew Ferguson) + +Suppress warnings about the deprecated sha module in Python 2.6. We'll remove this after rdiff-backup is ported to Python 3. (Patch from Josh Nisly) Test for symlink permissions now produces a functioning symlink. Thanks to diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py index 5bd27cf..0e8b41d 100644 --- a/rdiff-backup/rdiff_backup/robust.py +++ b/rdiff-backup/rdiff_backup/robust.py @@ -56,7 +56,7 @@ def catch_error(exc): 'ENAMETOOLONG', 'EINTR', 'ESTALE', 'ENOTEMPTY', 'EIO', 'ETXTBSY', 'ESRCH', 'EINVAL', 'EDEADLOCK', - 'EDEADLK', 'EOPNOTSUPP'))): + 'EDEADLK', 'EOPNOTSUPP', 'ETIMEDOUT'))): return 1 return 0 |