674941bbf7
53022930-lxc-connection-fix.patch 530229cb-non-x86-kvm-creation-fix.patch 53023f56-dont-alter-caps-machine-list-on-create.patch 53030858-generate_target-fix.patch 53037798-not-customizing-generate_target-fix.patch 53047532-dont-get-duplicated-disks.patch 53047595-calculate-disk-bus-properly.patch 530987c4-disk-bus-calculation-fix.patch 530c021c-attempt-empty-path-on-virDomainBlockStats.patch 530cd6ab-log-broken-xml.patch 530cf4de-allow-numbered-object-names.patch 530cfa5e-close-connection-on-tick-failure-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=146
35 lines
1023 B
Diff
35 lines
1023 B
Diff
Subject: xmlbuilder: Log broken XML if we can't parse it
|
|
From: Cole Robinson crobinso@redhat.com Tue Feb 25 12:45:15 2014 -0500
|
|
Date: Tue Feb 25 12:45:15 2014 -0500:
|
|
Git: 87c2ff1a14f3a78648c8a17cfa72e83098763ec8
|
|
|
|
Related to https://bugzilla.redhat.com/show_bug.cgi?id=1066564
|
|
|
|
diff --git a/virtinst/xmlbuilder.py b/virtinst/xmlbuilder.py
|
|
index d46738c..328f6f2 100644
|
|
--- a/virtinst/xmlbuilder.py
|
|
+++ b/virtinst/xmlbuilder.py
|
|
@@ -20,6 +20,7 @@
|
|
# MA 02110-1301 USA.
|
|
|
|
import copy
|
|
+import logging
|
|
import os
|
|
import re
|
|
|
|
@@ -686,7 +686,13 @@ class _XMLState(object):
|
|
else:
|
|
if not xml:
|
|
xml = self.make_xml_stub()
|
|
- doc = libxml2.parseDoc(xml)
|
|
+
|
|
+ try:
|
|
+ doc = libxml2.parseDoc(xml)
|
|
+ except:
|
|
+ logging.debug("Error parsing xml=\n%s", xml)
|
|
+ raise
|
|
+
|
|
self.xml_root_doc = _DocCleanupWrapper(doc)
|
|
self.xml_node = doc.children
|
|
self.xml_node.virtinst_is_build = self.is_build
|