[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/rpath.py
From: |
Andrew Ferguson |
Subject: |
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/rpath.py |
Date: |
Tue, 22 Jul 2008 17:46:59 +0000 |
CVSROOT: /sources/rdiff-backup
Module name: rdiff-backup
Changes by: Andrew Ferguson <owsla> 08/07/22 17:46:59
Modified files:
. : CHANGELOG
rdiff_backup : rpath.py
Log message:
Fall back on the Python make_file_dict function when the filename
contains
non-ASCII characters.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.293&r2=1.294
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/rpath.py?cvsroot=rdiff-backup&r1=1.125&r2=1.126
Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -b -r1.293 -r1.294
--- CHANGELOG 22 Jul 2008 16:47:10 -0000 1.293
+++ CHANGELOG 22 Jul 2008 17:46:59 -0000 1.294
@@ -1,6 +1,9 @@
New in v1.1.18 (????/??/??)
---------------------------
+Fall back on the Python make_file_dict function when the filename contains
+non-ASCII characters. (Andrew Ferguson)
+
Ignore Extended Attributes which have Unicode characters outside the current
system representation. These will be correctly handled when rdiff-backup
switches to Python 3, which will have full Unicode support. (Andrew Ferguson)
Index: rdiff_backup/rpath.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- rdiff_backup/rpath.py 13 Jul 2008 22:04:29 -0000 1.125
+++ rdiff_backup/rpath.py 22 Jul 2008 17:46:59 -0000 1.126
@@ -273,8 +273,13 @@
(incomplete) rpath object.
"""
if os.name != 'nt':
+ try:
return C.make_file_dict(filename)
- else:
+ except OSError, error:
+ # Unicode filenames should be process by the Python
version
+ if error.errno != errno.EILSEQ and error.errno !=
errno.EINVAL:
+ raise
+
return make_file_dict_python(filename)
def make_file_dict_python(filename):