PR#806: honour runroot --quiet for old-style call

Merges #806
https://pagure.io/koji/pull-request/806

Fixes: #807
https://pagure.io/koji/issue/807
runroot CLI ignores --quiet
This commit is contained in:
Mike McLean 2018-02-19 12:26:50 -05:00
commit 8cfb6032b4
2 changed files with 7 additions and 5 deletions

View file

@ -86,11 +86,12 @@ def handle_runroot(options, session, args):
print("User interrupt: canceling runroot task")
session.cancelTask(task_id)
raise
output = list_task_output_all_volumes(session, task_id)
if 'runroot.log' in output:
for volume in output['runroot.log']:
log = session.downloadTaskOutput(task_id, 'runroot.log', volume=volume)
sys.stdout.write(log)
if not opts.quiet:
output = list_task_output_all_volumes(session, task_id)
if 'runroot.log' in output:
for volume in output['runroot.log']:
log = session.downloadTaskOutput(task_id, 'runroot.log', volume=volume)
sys.stdout.write(log)
info = session.getTaskInfo(task_id)
if info is None:
sys.exit(1)

View file

@ -18,6 +18,7 @@ class TestListCommands(unittest.TestCase):
def setUp(self):
self.options = mock.MagicMock()
self.options.debug = False
self.options.quiet = False
self.session = mock.MagicMock()
self.session.getAPIVersion.return_value = koji.API_VERSION
self.args = [