diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-07-04 02:10:49 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-07-04 02:10:49 +0000 |
| commit | a82f975652fdecb212806af58974823d8566107f (patch) | |
| tree | 277e7225db9ee98d9fcee478118d1a2a0cfc3ce6 | |
| parent | b364d819a227af250f9e71c854718a25919dea00 (diff) | |
| download | rdiff-backup-a82f975652fdecb212806af58974823d8566107f.tar.gz | |
Fix typo in fs_abilities and add EILSEQ to list of recoverable errors.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@907 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 4 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/fs_abilities.py | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/robust.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index fa1e4f2..66dc67c 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,10 @@ New in v1.1.17 (????/??/??) --------------------------- +Fix typo in fs_abilities noticed by Martin Krafft. Add EILSEQ ("Invalid or +incomplete multibyte or wide character") to the list of recoverable errors. +Thanks to Hanno Stock for catching that. (Andrew Ferguson) + Catch another reasonable error when reading EAs. (Andrew Ferguson) Use the Python os.lstat() on Windows. (Patch from Josh Nisly) diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py index 286731e..2be4740 100644 --- a/rdiff-backup/rdiff_backup/fs_abilities.py +++ b/rdiff-backup/rdiff_backup/fs_abilities.py @@ -541,7 +541,7 @@ class SetGlobals: ('acls_active', 'acls_write', 'acls_conn')) if Globals.never_drop_acls and not Globals.acls_active: log.Log.FatalError("--never-drop-acls specified, but ACL support\n" - "missing from destination filesystem") + "missing from source filesystem") def set_win_acls(self): self.update_triple(self.src_fsa.win_acls, self.dest_fsa.win_acls, diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py index df190d4..d339c24 100644 --- a/rdiff-backup/rdiff_backup/robust.py +++ b/rdiff-backup/rdiff_backup/robust.py @@ -52,7 +52,7 @@ def catch_error(exc): (exc[0] in ('invalid mode: rb', 'Not a gzipped file') or errno.errorcode.has_key(exc[0]) and errno.errorcode[exc[0]] in ('EPERM', 'ENOENT', 'EACCES', 'EBUSY', - 'EEXIST', 'ENOTDIR', + 'EEXIST', 'ENOTDIR', 'EILSEQ', 'ENAMETOOLONG', 'EINTR', 'ENOTEMPTY', 'EIO', 'ETXTBSY', 'ESRCH', 'EINVAL', 'EDEADLOCK', |