mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Provide verbose output with --verbose
23b0b6bc
added logging in case of an FDroidException on the build server. This broke the log of apps that fail to build. Prior to23b0b6bc
a failing build in the VM triggered a BuildException on the server side but the build output was written to the log in the finally part of build_server(). After23b0b6bc
the finally part writs the build as well but the BuildException is caught in main() and the build log is overwritten with the empty exception content. This patch always adds the build log to the exception so it is written to the log. Closes: #882
This commit is contained in:
parent
63eaa5469c
commit
2b41dffcb2
@ -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:
|
||||||
|
Loading…
Reference in New Issue
Block a user