Handle tracebacks as str or bytes
Kobo 0.36.0 changed how tracebacks are handled. Instead of `bytes`, it
returns a `str`. That makes pungi fail to write it into a file opened as
binary.
Relates: https://github.com/release-engineering/kobo/pull/246
Fixes: https://pagure.io/pungi/issue/1756
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
(cherry picked from commit 29c166ab99
)
This commit is contained in:
parent
1fe075e7e4
commit
e601345a38
@ -718,8 +718,10 @@ class Compose(kobo.log.LoggingBase):
|
|||||||
basename += "-" + detail
|
basename += "-" + detail
|
||||||
tb_path = self.paths.log.log_file("global", basename)
|
tb_path = self.paths.log.log_file("global", basename)
|
||||||
self.log_error("Extended traceback in: %s", tb_path)
|
self.log_error("Extended traceback in: %s", tb_path)
|
||||||
with open(tb_path, "wb") as f:
|
tback = kobo.tback.Traceback(show_locals=show_locals).get_traceback()
|
||||||
f.write(kobo.tback.Traceback(show_locals=show_locals).get_traceback())
|
# Kobo 0.36.0 returns traceback as str, older versions return bytes
|
||||||
|
with open(tb_path, "wb" if isinstance(tback, bytes) else "w") as f:
|
||||||
|
f.write(tback)
|
||||||
|
|
||||||
def load_old_compose_config(self):
|
def load_old_compose_config(self):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user