[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.500.5-3-4-gb8630f3

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 9d1703db92871e7455fc45106f5a0718654826f1
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Fri Mar 25 09:07:43 2011 +0100

    Drop patch
    
    0004-Features-Fix-XML-parsing-using-dictionary-syntax.patch - fixed upstream http://hg.fedorahosted.org/hg/python-virtinst/rev/34bafa85c55f

diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index c7c115c..921a530 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -7,7 +7,7 @@ Subject: Fix path to pygrub
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/virtinst/util.py b/virtinst/util.py
-index 083633f..77562e5 100644
+index e259fdb..bb2b703 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
 @@ -386,11 +386,11 @@ def pygrub_path(conn=None):
diff --git a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
index fa81e48..20f05eb 100644
--- a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
+++ b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
@@ -8,7 +8,7 @@ Since console-setup 1.47 the keyboard configuration is in a new package keyboard
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/util.py b/virtinst/util.py
-index 77562e5..8110a6c 100644
+index bb2b703..a072c05 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
 @@ -44,7 +44,7 @@ import support
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
deleted file mode 100644
index 2dceeda..0000000
--- a/debian/patches/0004-Features-Fix-XML-parsing-using-dictionary-syntax.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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 0481c2a..3419750 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 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