[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.600.0-2

[Guido Günther]

The following commit has been merged in the master branch:
commit 18951a9cabd51ab9f3ab8bf6cf1768827f313811
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Dec 31 17:12:30 2011 +0100

    VirtualDeviceAddress: Only clear XML if not building from scratch
    
    Cherry-picked from upstream.
    Closes: #652879

diff --git a/debian/patches/0004-VirtualDeviceAddress-Only-clear-XML-if-not-building-.patch b/debian/patches/0004-VirtualDeviceAddress-Only-clear-XML-if-not-building-.patch
new file mode 100644
index 0000000..afa4603
--- /dev/null
+++ b/debian/patches/0004-VirtualDeviceAddress-Only-clear-XML-if-not-building-.patch
@@ -0,0 +1,22 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Mon, 29 Aug 2011 13:12:32 -0400
+Subject: VirtualDeviceAddress: Only clear XML if not building from scratch
+
+---
+ virtinst/VirtualDevice.py |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/virtinst/VirtualDevice.py b/virtinst/VirtualDevice.py
+index 386eb00..869d50e 100644
+--- a/virtinst/VirtualDevice.py
++++ b/virtinst/VirtualDevice.py
+@@ -170,7 +170,8 @@ class VirtualDeviceAddress(XMLBuilderDomain):
+         self._unit = None
+         self._port = None
+ 
+-        self._remove_child_xpath("./address")
++        if self._is_parse():
++            self._remove_child_xpath("./address")
+ 
+     def _get_type(self):
+         return self._type
diff --git a/debian/patches/series b/debian/patches/series
index 3419750..b0ceb7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-fix-path-to-hvmloader.patch
 0002-Fix-path-to-pygrub.patch
 0003-Fix-path-to-keyboard-configuration.patch
+0004-VirtualDeviceAddress-Only-clear-XML-if-not-building-.patch

-- 
Virtinst Debian packaging