[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, master, updated. debian/0.8.4-7-3-gbe93227

[Laurent Léonard]

The following commit has been merged in the master branch:
commit be93227e86e606f837c7ef1fa00085c461e90a57
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Thu Sep 9 13:58:29 2010 +0200

    New patch 0007-Fix-livecd-customize-before-install-traceback.patch

diff --git a/debian/patches/0007-Fix-livecd-customize-before-install-traceback.patch b/debian/patches/0007-Fix-livecd-customize-before-install-traceback.patch
new file mode 100644
index 0000000..c2e86c3
--- /dev/null
+++ b/debian/patches/0007-Fix-livecd-customize-before-install-traceback.patch
@@ -0,0 +1,26 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Thu, 6 May 2010 13:54:16 -0400
+Subject: [PATCH] Fix livecd 'customize before install' traceback
+
+Origin: upstream, http://hg.fedorahosted.org/hg/virt-manager/rev/f2d3931243fe
+---
+ src/virtManager/domain.py |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/virtManager/domain.py b/src/virtManager/domain.py
+index 2d287f6..18fb49d 100644
+--- a/src/virtManager/domain.py
++++ b/src/virtManager/domain.py
+@@ -1996,7 +1996,10 @@ class vmmDomainVirtinst(vmmDomainBase):
+         return libvirt.VIR_DOMAIN_SHUTOFF
+ 
+     def get_xml(self):
+-        return self._backend.get_config_xml()
++        xml = self._backend.get_config_xml()
++        if not xml:
++            xml = self._backend.get_config_xml(install=False)
++        return xml
+     def _get_inactive_xml(self):
+         return self.get_xml()
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 722ca47..afdb55f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-create-Skip-post-install-restart-if-user-destroys-VM.patch
 0005-Add-conn-info-to-virtinst.VirtualGraphics.patch
 0006-Fix-error-launching-create-wizard-on-qemu-session.patch
+0007-Fix-livecd-customize-before-install-traceback.patch

-- 
VirtManager Debian packaging