PR#2347: cli: fix image-build-indirection --wait - koji

koji

#2347 cli: fix image-build-indirection --wait

Merged 3 years ago by mikem. Opened 3 years ago by tkopecek.

tkopecek/koji issue2046 into master

cli: fix image-build-indirection --wait

Tomas Kopecek • 3 years ago

abd4ac3

cli/koji_cli/commands.py

file modified

+3 -15

		`@@ -538,8 +538,6 @@`
		`session.logout()`
		`return watch_tasks(session, [task_id], quiet=build_opts.quiet,`
		`poll_interval=options.poll_interval)`
		`- else:`
		`- return`


		`def handle_chain_build(options, session, args):`
		`@@ -1155,8 +1153,6 @@`
		`session.logout()`
		`return watch_tasks(session, [task_id], quiet=my_opts.quiet,`
		`poll_interval=options.poll_interval)`
		`- else:`
		`- return`


		`def handle_import(goptions, session, args):`
		`@@ -5904,11 +5900,9 @@`
		`if not options.quiet:`
		`print("Created task: %d" % task_id)`
		`print("Task info: %s/taskinfo?taskID=%s" % (options.weburl, task_id))`
		`- # if task_opts.wait or (task_opts.wait is None and not _running_in_bg()):`
		`- # session.logout()`
		`- # return watch_tasks(session, [task_id], quiet=options.quiet)`
		`- # else:`
		`- # return`
		`+ if task_opts.wait or (task_opts.wait is None and not _running_in_bg()):`
		`+ session.logout()`
		`+ return watch_tasks(session, [task_id], quiet=options.quiet)`


		`def handle_image_build(options, session, args):`
		`@@ -6105,8 +6099,6 @@`
		`session.logout()`
		`return watch_tasks(session, [task_id], quiet=options.quiet,`
		`poll_interval=options.poll_interval)`
		`- else:`
		`- return`


		`def _build_image_oz(options, task_opts, session, args):`
		`@@ -6176,8 +6168,6 @@`
		`session.logout()`
		`return watch_tasks(session, [task_id], quiet=options.quiet,`
		`poll_interval=options.poll_interval)`
		`- else:`
		`- return`


		`def handle_win_build(options, session, args):`
		`@@ -6253,8 +6243,6 @@`
		`session.logout()`
		`return watch_tasks(session, [task_id], quiet=build_opts.quiet,`
		`poll_interval=options.poll_interval)`
		`- else:`
		`- return`


		`def handle_free_task(goptions, session, args):`

tests/test_cli/test_image_build_indirection.py

file modified

+1 -1

		`@@ -28,7 +28,7 @@`
		`"indirection_template_url": "git://git.github.org/git/",`
		`"results_loc": "results",`
		`"scratch": None,`
		`- "wait": None,`
		`+ "wait": False,`
		`"noprogress": None,`
		`"skip_tag": False,`
		`}`