33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
|
Subject: inspection: handle failures in application listing
|
||
|
From: Pino Toscano ptoscano@redhat.com Tue Feb 5 18:17:42 2019 +0100
|
||
|
Date: Thu Feb 7 09:59:28 2019 -0500:
|
||
|
Git: 1018ab448484f2e5836fb540d253e813bd8cf6d6
|
||
|
|
||
|
The Python binding of libguestfs errors out in case any of the details
|
||
|
(e.g. summary, description) of an application are not proper UTF-8.
|
||
|
This seems a rare situation, which nevertheless causes the failure of
|
||
|
the inspection of a guest, making the rest of the metadata not used.
|
||
|
|
||
|
While these encoding issues are tackled, and fixed in python-libguestfs
|
||
|
(or libguestfs itself), gracefully handle the failure of
|
||
|
inspect_list_applications(), so at least the rest of the details of a
|
||
|
guest are used/shown.
|
||
|
|
||
|
diff --git a/virtManager/inspection.py b/virtManager/inspection.py
|
||
|
index fde48474..9923dde2 100644
|
||
|
--- a/virtManager/inspection.py
|
||
|
+++ b/virtManager/inspection.py
|
||
|
@@ -275,7 +275,11 @@ class vmmInspection(vmmGObject):
|
||
|
icon = None
|
||
|
|
||
|
# Inspection applications.
|
||
|
- apps = g.inspect_list_applications(root)
|
||
|
+ try:
|
||
|
+ apps = g.inspect_list_applications(root)
|
||
|
+ except Exception:
|
||
|
+ logging.exception("%s: exception while listing apps (ignored)",
|
||
|
+ prettyvm)
|
||
|
|
||
|
# Force the libguestfs handle to close right now.
|
||
|
del g
|