parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Ensure echo always has an argument

This commit is contained in:
Joshua Boniface 2021-11-25 09:33:26 -05:00
parent a8899a1d66
commit 195f31501c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client-cli/pvc/pvc.py
View File

@ -364,7 +364,7 @@ def cluster_list(raw):
if not raw: if not raw:
# Display the data nicely # Display the data nicely
echo("Available clusters:") echo("Available clusters:")
echo() echo("")
echo( echo(
"{bold}{name: <{name_length}} {description: <{description_length}} {address: <{address_length}} {port: <{port_length}} {scheme: <{scheme_length}} {api_key: <{api_key_length}}{end_bold}".format( "{bold}{name: <{name_length}} {description: <{description_length}} {address: <{address_length}} {port: <{port_length}} {scheme: <{scheme_length}} {api_key: <{api_key_length}}{end_bold}".format(
bold=ansiprint.bold(), bold=ansiprint.bold(),
@ -481,7 +481,7 @@ def node_secondary(node, wait):
" These jobs will continue executing, but status will not be visible until the current" " These jobs will continue executing, but status will not be visible until the current"
) )
echo(" node returns to primary state.") echo(" node returns to primary state.")
echo() echo("")
retcode, retmsg = pvc_node.node_coordinator_state(config, node, "secondary") retcode, retmsg = pvc_node.node_coordinator_state(config, node, "secondary")
if not retcode: if not retcode:
@ -534,7 +534,7 @@ def node_primary(node, wait):
" These jobs will continue executing, but status will not be visible until the current" " These jobs will continue executing, but status will not be visible until the current"
) )
echo(" node returns to primary state.") echo(" node returns to primary state.")
echo() echo("")
retcode, retmsg = pvc_node.node_coordinator_state(config, node, "primary") retcode, retmsg = pvc_node.node_coordinator_state(config, node, "primary")
if not retcode: if not retcode:
@ -5329,7 +5329,7 @@ def provisioner_create(name, profile, wait_flag, define_flag, start_flag, script
task_id = retdata task_id = retdata
echo("Task ID: {}".format(task_id)) echo("Task ID: {}".format(task_id))
echo() echo("")
# Wait for the task to start # Wait for the task to start
echo("Waiting for task to start...", nl=False) echo("Waiting for task to start...", nl=False)
@ -5340,7 +5340,7 @@ def provisioner_create(name, profile, wait_flag, define_flag, start_flag, script
break break
echo(".", nl=False) echo(".", nl=False)
echo(" done.") echo(" done.")
echo() echo("")
# Start following the task state, updating progress as we go # Start following the task state, updating progress as we go
total_task = task_status.get("total") total_task = task_status.get("total")
@ -5371,7 +5371,7 @@ def provisioner_create(name, profile, wait_flag, define_flag, start_flag, script
if task_status.get("state") == "SUCCESS": if task_status.get("state") == "SUCCESS":
bar.update(total_task - last_task) bar.update(total_task - last_task)
echo() echo("")
retdata = task_status.get("state") + ": " + task_status.get("status") retdata = task_status.get("state") + ": " + task_status.get("status")
cleanup(retcode, retdata) cleanup(retcode, retdata)