From 5ad2804be66774593052c991ef2ab4692c62b378 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Mon, 8 May 2017 11:16:08 +0200 Subject: [PATCH] tools: avoid text spilling into variables While libvirt-guests.sh is running cases can let guest_is_on fail which causes check_guests_shutdown to print output. That output shall not spill into the users of function check_guests_shutdown which is therefore now returning values in a variable like guest_is_on already did. Signed-off-by: Christian Ehrhardt --- tools/libvirt-guests.sh.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 791d927..464ebb5 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -329,12 +329,13 @@ guest_count() # check_guests_shutdown URI GUESTS # check if shutdown is complete on guests in "GUESTS" and returns only # guests that are still shutting down +# Result is returned in "guests_shutting_down" check_guests_shutdown() { uri=$1 guests=$2 - guests_up= + guests_shutting_down= for guest in $guests; do if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." @@ -342,10 +343,9 @@ check_guests_shutdown() continue fi if "$guest_running"; then - guests_up="$guests_up $guest" + guests_shutting_down="$guests_shutting_down $guest" fi done - echo "$guests_up" } # print_guests_shutdown URI BEFORE AFTER @@ -420,7 +420,8 @@ shutdown_guests_parallel() fi on_shutdown_prev=$on_shutdown - on_shutdown=$(check_guests_shutdown "$uri" "$on_shutdown") + check_guests_shutdown "$uri" "$on_shutdown" + on_shutdown="$guests_shutting_down" print_guests_shutdown "$uri" "$on_shutdown_prev" "$on_shutdown" done } -- 2.7.4