mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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. :returns: A PopenResult.
""" """
result = FDroidPopenBytes(commands, cwd, output, stderr_to_stdout) 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 return result