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

Ignore encoding errors in logs

Browse source 
Found while compiling io.privatestorage.privatestoragemobile_9:

Traceback (most recent call last):
  File "/home/fdroid/fdroidserver/fdroidserver/build.py", line 1053, in main
    if trybuild(app, build, build_dir, output_dir, log_dir,
  File "/home/fdroid/fdroidserver/fdroidserver/build.py", line 813, in trybuild
    build_server(app, build, vcs, build_dir, output_dir, log_dir, force)
  File "/home/fdroid/fdroidserver/fdroidserver/build.py", line 253, in build_server
    logging.debug("buildserver > " + str(line, 'utf-8').rstrip())
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xfa in position 8: invalid start byte
This commit is contained in:
Jochen Sprickerhof 2023-09-22 12:50:05 +02:00
parent 047819d34f
commit 49c415424d
No known key found for this signature in database
GPG key ID: 5BFFDCC258E69433
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/build.py
View file

@ -250,13 +250,13 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
line = cmd_stdout.readline()
if line:
if options.verbose:
logging.debug("buildserver > " + str(line, 'utf-8').rstrip())
logging.debug("buildserver > " + str(line, 'utf-8', 'replace').rstrip())
output += line
else:
time.sleep(0.05)
for line in cmd_stdout.readlines():
if options.verbose:
logging.debug("buildserver > " + str(line, 'utf-8').rstrip())
logging.debug("buildserver > " + str(line, 'utf-8', 'replace').rstrip())
output += line
finally:
cmd_stdout.close()
@ -270,7 +270,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
else:
message = "Build.py failed on server for {0}:{1}"
raise BuildException(message.format(app.id, build.versionName),
str(output, 'utf-8'))
str(output, 'utf-8', 'replace'))
# Retreive logs...
toolsversion_log = common.get_toolsversion_logname(app, build)
@ -296,7 +296,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
except Exception as exc:
raise BuildException(
"Build failed for {0}:{1} - missing output files".format(
app.id, build.versionName), str(output, 'utf-8')) from exc
app.id, build.versionName), str(output, 'utf-8', 'replace')) from exc
ftp.close()
finally: