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

download-logs: prefer getBuildLogs for builds

Browse source
This commit is contained in:
Mike McLean 2024-07-01 16:16:26 -04:00 • committed by Tomas Kopecek
parent f88eddb115
commit 32a609925d
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cli/koji_cli/commands.py
View file

@ -7107,25 +7107,25 @@ def anon_handle_download_logs(options, session, args):
save_logs(child_task['id'], match, task_log_dir, recurse)
ensure_connection(session, options)
task_id = None
build_id = None
for arg in args:
task_id = None
build_id = None
if suboptions.nvr:
suboptions.recurse = True
binfo = session.getBuild(arg)
if binfo is None:
error("There is no build with n-v-r: %s" % arg)
if binfo.get('task_id'):
task_id = binfo['task_id']
sys.stdout.write("Using task ID: %s\n" % task_id)
elif binfo.get('build_id'):
if binfo.get('build_id'):
build_id = binfo['build_id']
sys.stdout.write("Using build ID: %s\n" % build_id)
elif binfo.get('task_id'):
task_id = binfo['task_id']
sys.stdout.write("Using task ID: %s\n" % task_id)
else:
try:
task_id = int(arg)
except ValueError:
error("Task id must be number: %r" % arg)
error("Task id must be a number: %r" % arg)
if task_id:
save_logs(task_id, suboptions.match, suboptions.dir, suboptions.recurse)
elif build_id:

2
tests/test_cli/test_download_logs.py
View file

@ -59,7 +59,7 @@ Note this command only downloads task logs, not build logs.
anon_handle_download_logs,
self.options, self.session, [task_id],
stdout='',
stderr='Task id must be number: %r\n' % task_id,
stderr='Task id must be a number: %r\n' % task_id,
activate_session=None,
exit_code=1
)