Author: futatuki
Date: Sat Nov 23 10:08:30 2019
New Revision: 1870217
URL: http://svn.apache.org/viewvc?rev=1870217&view=rev
Log:
Follow up to r1870204: Fix encoding to decode bytes data from stderr
* tools/server-side/svn-backup-dumps.py (SvnBackup.exec_cmd_unix):
- Decoding the data from 'svnadmin dump' as 'utf-8' causes crash when
LC_CTYPE is not 'utf-8'. So we use sys.stdout.encoding which is set
by environment instead.
Suggested by: Jun Omae <jun66j5_{AT}_gmail.com>
- remove white space after printing each stderr output
Modified:
subversion/trunk/tools/server-side/svn-backup-dumps.py
Modified: subversion/trunk/tools/server-side/svn-backup-dumps.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svn-backup-dumps.py?rev=1870217&r1=1870216&r2=1870217&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svn-backup-dumps.py (original)
+++ subversion/trunk/tools/server-side/svn-backup-dumps.py Sat Nov 23 10:08:30
2019
@@ -402,7 +402,8 @@ class SvnBackup:
bufout += buf
else:
if printerr:
- sys.stdout.write("%s " % buf.decode('utf-8'))
+ sys.stdout.write(buf.decode(sys.stdout.encoding,
+ 'backslashrreplace'))
else:
buferr += buf
if len(readfds) == 0:
