diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2011-11-10 12:06:07 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2011-11-10 12:06:07 +0000 |
| commit | 8bae3610af1ed9bf594388e212106a19a944137d (patch) | |
| tree | 4199ed4a11f390302aaaa6d5926a2a6e71f0d9cc /app-emulation | |
| parent | Add ~x86-fbsd (diff) | |
| download | gentoo-2-8bae3610af1ed9bf594388e212106a19a944137d.tar.gz gentoo-2-8bae3610af1ed9bf594388e212106a19a944137d.tar.bz2 gentoo-2-8bae3610af1ed9bf594388e212106a19a944137d.zip | |
Fix pyxml patch
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/xen-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch | 26 |
2 files changed, 15 insertions, 17 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index 90cbdcb52d5b..9390baea3c2e 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.105 2011/11/07 17:31:40 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.106 2011/11/10 12:06:07 alexxy Exp $ + + 10 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org> + files/xen-tools-4.1.2-pyxml.patch: + Fix pyxml patch 07 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org> +files/xen-tools-4.1.2-pyxml.patch, files/xen-tools-4.1.1-curl.patch, diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch b/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch index 099d1f6913aa..5b14e4c410df 100644 --- a/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch +++ b/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch @@ -1,18 +1,12 @@ ---- xml/__init__.py -+++ xml/__init__.py -@@ -21,12 +21,14 @@ +--- tools/python/xen/xm/create.py ++++ tools/python/xen/xm/create.py +@@ -1538,6 +1538,9 @@ + SXPPrettyPrint.prettyprint(config) - _MINIMUM_XMLPLUS_VERSION = (0, 8, 4) + if opts.vals.xmldryrun and serverType == SERVER_XEN_API: ++ import xml ++ if hasattr(xml, "use_pyxml"): ++ xml.use_pyxml() + from xml.dom.ext import PrettyPrint as XMLPrettyPrint + XMLPrettyPrint(doc) -+import pprint -+import sys - - def use_pyxml(): -+ pprint.pprint(sys.modules) - import _xmlplus - v = _xmlplus.version_info - if v >= _MINIMUM_XMLPLUS_VERSION: -- import sys - _xmlplus.__path__.extend(__path__) - sys.modules[__name__] = _xmlplus - modules = [] |