particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix runroot output on py3

Browse source
This commit is contained in:
Mike McLean 2018-03-01 10:46:10 -05:00
parent 50d02cdca6
commit 8e4df0db11
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/cli/runroot.py
View file

@ -5,6 +5,8 @@ import koji
from koji.plugin import export_cli from koji.plugin import export_cli
from koji_cli.lib import _, activate_session, OptionParser, watch_tasks, \ from koji_cli.lib import _, activate_session, OptionParser, watch_tasks, \
list_task_output_all_volumes list_task_output_all_volumes
import six
@export_cli @export_cli
def handle_runroot(options, session, args): def handle_runroot(options, session, args):
@ -91,7 +93,12 @@ def handle_runroot(options, session, args):
if 'runroot.log' in output: if 'runroot.log' in output:
for volume in output['runroot.log']: for volume in output['runroot.log']:
log = session.downloadTaskOutput(task_id, 'runroot.log', volume=volume) log = session.downloadTaskOutput(task_id, 'runroot.log', volume=volume)
sys.stdout.write(log) # runroot output, while normally text, can be *anything*, so
# treat it as binary
if six.PY3:
sys.stdout.buffer.write(log)
else:
sys.stdout.write(log)
info = session.getTaskInfo(task_id) info = session.getTaskInfo(task_id)
if info is None: if info is None:
sys.exit(1) sys.exit(1)