mirror/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2026-03-18 06:58:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'popen-nonutf8' into 'master'

Browse Source 
common: don't assume build script output is utf-8

See merge request !224
This commit is contained in:
Ciaran Gultnieks
2017-03-13 07:40:31 +00:00
parent 001d3b1fbb 37c802d323
commit 7211381e27
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/common.py
View File

@@ -1798,7 +1798,7 @@ def FDroidPopen(commands, cwd=None, output=True, stderr_to_stdout=True):
:returns: A PopenResult.
"""
result = FDroidPopenBytes(commands, cwd, output, stderr_to_stdout)
result.output = result.output.decode('utf-8')
result.output = result.output.decode('utf-8', 'ignore')
return result