1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00

Merge branch 'verbose_build' into 'master'

Provide verbose output with --verbose

Closes #882

See merge request fdroid/fdroidserver!1013
This commit is contained in:
Jochen Sprickerhof 2021-09-10 17:01:00 +00:00
commit 52eeb21763

View File

@ -266,7 +266,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
else: else:
message = "Build.py failed on server for {0}:{1}" message = "Build.py failed on server for {0}:{1}"
raise BuildException(message.format(app.id, build.versionName), raise BuildException(message.format(app.id, build.versionName),
None if options.verbose else str(output, 'utf-8')) str(output, 'utf-8'))
# Retreive logs... # Retreive logs...
toolsversion_log = common.get_toolsversion_logname(app, build) toolsversion_log = common.get_toolsversion_logname(app, build)
@ -292,7 +292,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
except Exception: except Exception:
raise BuildException( raise BuildException(
"Build failed for {0}:{1} - missing output files".format( "Build failed for {0}:{1} - missing output files".format(
app.id, build.versionName), None if options.verbose else str(output, 'utf-8')) app.id, build.versionName), str(output, 'utf-8'))
ftp.close() ftp.close()
finally: finally: