From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 19 Apr 2018 06:41:03 +0000 (+0200)
Subject: tools: do not report unknown guests in print_guests_shutdown
X-Git-Tag: v4.3.0-rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cce57265c42e630036ed4d292d6399cdee08fd78;p=thirdparty%2Flibvirt.git

tools: do not report unknown guests in print_guests_shutdown

If another event in background while running libvirt-guests.sh
completely undefines a guest it will no more be available for proper
reporting of its shutdown.

This appears in the log as:
  Failed to determint state of guest: <UUID>. Not tracking it anymore
  Shutdown of guest  complete

The first message already reports that we are giving up on the guest
(per UUID which is all we have left at that point). To avoid the message
with an empty guest_name in such a case lets check what guest_name
returned and only print a report on valid content.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Dariusz Gadomski <dariusz.gadomski@canonical.com>
---

diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
index 28fe506017..4bc6e866f0 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
@@ -363,8 +363,10 @@ print_guests_shutdown()
         esac
 
         name=$(guest_name "$uri" "$guest")
-        eval_gettext "Shutdown of guest \$name complete."
-        echo
+        if [ -n "$name" ]; then
+            eval_gettext "Shutdown of guest \$name complete."
+            echo
+        fi
     done
 }