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

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 710912b0b42b662c3a20a46e79e3e801504a328f
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Mon Mar 7 14:43:08 2011 +0100

    New patch 0004-Features-Fix-XML-parsing-using-dictionary-syntax.patch

diff --git a/debian/patches/0001-fix-path-to-hvmloader.patch b/debian/patches/0001-fix-path-to-hvmloader.patch
index 00c5e5c..1c24293 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -1,6 +1,6 @@
 From: Guido Guenther <agx at sigxcpu.org>
 Date: Tue, 24 Jun 2008 15:24:21 +0200
-Subject: [PATCH] fix path to hvmloader
+Subject: fix path to hvmloader
 
 Closes: #487682
 ---
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index 1c89dd1..c7c115c 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -1,6 +1,6 @@
 From: Marco Sinhoreli <msinhore at gmail.com>
 Date: Thu, 26 Jun 2008 18:07:13 +0200
-Subject: [PATCH] Fix path to pygrub
+Subject: Fix path to pygrub
 
 ---
  virtinst/util.py |    4 ++--
diff --git a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
index 396bd9b..fa81e48 100644
--- a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
+++ b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
@@ -1,6 +1,6 @@
 From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
 Date: Thu, 24 Dec 2009 00:07:50 +0100
-Subject: [PATCH] Fix path to keyboard configuration.
+Subject: Fix path to keyboard configuration.
 
 Since console-setup 1.47 the keyboard configuration is in a new package keyboard-configuration and has its own configuration file.
 ---
diff --git a/debian/patches/0004-Features-Fix-XML-parsing-using-dictionary-syntax.patch b/debian/patches/0004-Features-Fix-XML-parsing-using-dictionary-syntax.patch
new file mode 100644
index 0000000..2dceeda
--- /dev/null
+++ b/debian/patches/0004-Features-Fix-XML-parsing-using-dictionary-syntax.patch
@@ -0,0 +1,65 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Tue, 1 Mar 2011 18:43:32 -0500
+Subject: Features: Fix XML parsing using dictionary syntax
+
+Origin: http://hg.fedorahosted.org/hg/python-virtinst/rev/34bafa85c55f
+Bug-Debian: http://bugs.debian.org/616674
+---
+ tests/xmlparse-xml/change-guest-out.xml |    2 +-
+ tests/xmlparse.py                       |    9 +++++++++
+ virtinst/DomainFeatures.py              |    6 +++---
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml
+index 5f62f73..ef273f0 100644
+--- a/tests/xmlparse-xml/change-guest-out.xml
++++ b/tests/xmlparse-xml/change-guest-out.xml
+@@ -9,7 +9,7 @@
+     <bootmenu enable="no"/>
+   </os>
+   <features>
+-    <pae/>
++    <apic/>
+   </features>
+   <cpu match="strict">
+     <model>qemu64</model>
+diff --git a/tests/xmlparse.py b/tests/xmlparse.py
+index 6ef1235..117acb8 100644
+--- a/tests/xmlparse.py
++++ b/tests/xmlparse.py
+@@ -131,6 +131,15 @@ class XMLParseTest(unittest.TestCase):
+         check("apic", True, False)
+         check("pae", False, True)
+ 
++        def feature_checker(prop, origval, newval):
++            self.assertEqual(guest.features[prop], origval)
++            guest.features[prop] = newval
++            self.assertEqual(guest.features[prop], newval)
++
++        feature_checker("acpi", False, False)
++        feature_checker("apic", False, True)
++        feature_checker("pae", True, False)
++
+         check = self._make_checker(guest.cpu)
+         check("match", "exact", "strict")
+         check("model", "footest", "qemu64")
+diff --git a/virtinst/DomainFeatures.py b/virtinst/DomainFeatures.py
+index 0d8242d..d284fac 100644
+--- a/virtinst/DomainFeatures.py
++++ b/virtinst/DomainFeatures.py
+@@ -61,11 +61,11 @@ class DomainFeatures(XMLBuilderDomain.XMLBuilderDomain):
+                         xpath="./features/pae", is_bool=True)
+ 
+     def __setitem__(self, attr, val):
+-        setattr(self, attr, val)
++        return setattr(self, attr, val)
+     def __getitem__(self, attr):
+-        getattr(self, attr)
++        return getattr(self, attr)
+     def __delitem__(self, attr):
+-        setattr(self, attr, None)
++        return setattr(self, attr, None)
+ 
+ 
+     def _get_xml_config(self, defaults=None):
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 3419750..0481c2a 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-Features-Fix-XML-parsing-using-dictionary-syntax.patch

-- 
Virtinst Debian packaging