1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 22:40:12 +01:00

FDroidPopen: return str again

In the future we might want to instead return bytes, but for now the
easiest for the port to python3 is to continue to return str.
This commit is contained in:
Daniel Martí 2016-01-04 17:55:37 +01:00
parent b73cc8e0b3
commit 5026d4e08b

View File

@ -1672,9 +1672,9 @@ def FDroidPopen(commands, cwd=None, output=True, stderr_to_stdout=True):
line = stdout_queue.get()
if output and options.verbose:
# Output directly to console
sys.stderr.write(line)
sys.stderr.buffer.write(line)
sys.stderr.flush()
result.output += line
result.output += line.decode('utf-8')
time.sleep(0.1)