From 6fe1ccdff9062b66783f834df4f0523d6e20493d Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Thu, 10 Nov 2011 12:06:07 +0000 Subject: [PATCH] Fix pyxml patch Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- app-emulation/xen-tools/ChangeLog | 6 +++- app-emulation/xen-tools/Manifest | 32 +++++++++---------- .../files/xen-tools-4.1.2-pyxml.patch | 26 ++++++--------- 3 files changed, 31 insertions(+), 33 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 + files/xen-tools-4.1.2-pyxml.patch: + Fix pyxml patch 07 Nov 2011; Alexey Shvetsov +files/xen-tools-4.1.2-pyxml.patch, files/xen-tools-4.1.1-curl.patch, diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 099c70afbabb..46ebc51f2152 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -16,7 +16,7 @@ AUX xen-tools-4.1.1-bridge.patch 449 RMD160 165524a3a92014f79e886b0a20dba8b1c192 AUX xen-tools-4.1.1-curl.patch 550 RMD160 87e09f92f292d89c86416036d4207b0460a3dc6e SHA1 dec0e47d62d85cb21d9fb6d097ab183f02b80310 SHA256 4bdb2875b36e7dbb0bd8d61b697da78007bb22922f56e020795c91ebb9ddd50b AUX xen-tools-4.1.1-libxl-tap.patch 1071 RMD160 a345fab381af82ffdf7a4206d9db30f6845e5867 SHA1 bbe2ddd9eb8119ae172fd9671fe58bda80bf9095 SHA256 ee03a5b68a9edf5d4fe78a322ff261e13f6ded879f3898b0ea72c407f678f885 AUX xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 RMD160 7d3bd028c5da4b2a48f1e992900bbf1866c9c4ea SHA1 55c5476e632649d4d635db1023193216455d076d SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f -AUX xen-tools-4.1.2-pyxml.patch 400 RMD160 53f282355cfce4d789aae52e1883ab6a583e4828 SHA1 9d05327d9b4343141f351b0f4ebbec0cda9bc683 SHA256 abe9112cb1ce3bc8d8541beabe9c8efe7b674e26584a6c51a2eae61033e8cab2 +AUX xen-tools-4.1.2-pyxml.patch 408 RMD160 131ff6e6a1b3bd71ff584d3cbfca4b078abd77b1 SHA1 5fa6ce64ef125e97df65ed357e1c40964a7a3619 SHA256 6a8d8ca5478bc68850fd930749ca22207807c87f8624c0c3596a8cd70bc06c65 AUX xenconsoled.confd 44 RMD160 0134f85258cf524807c4e2eae94739a70808c20d SHA1 6435bba449e9cffd3f99c5afdeb3cc37ecbd744d SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060 AUX xenconsoled.initd 652 RMD160 5aa785e9c73c5eb8460863af2c1bc50d2a07faf4 SHA1 dceffade1f3f5f2503fc6c3ccb4b9f9788365d00 SHA256 1a5594e4e924b94490c5c942b1b63e5fe857b8ad8061060e5d8a3bdfc9f0f1b7 AUX xend.initd-r1 1664 RMD160 8d7ea19e96c49631a8f432dd93ae91ca4f37d26b SHA1 bd3a8f083288cd89624d31f3c7932e1a831d99a3 SHA256 6ea8848ca1203c5ef8490014ded86ec67100385c217660d393b25dc6519d254d @@ -37,22 +37,22 @@ EBUILD xen-tools-4.1.1-r5.ebuild 10316 RMD160 92450a0dba081cda3e23e94072953b8585 EBUILD xen-tools-4.1.1-r6.ebuild 10651 RMD160 993111049c34acbbf59857b3794e68319a50e301 SHA1 4af2c578e12f6f9b29490dc04488a956d526af4c SHA256 4147a0918b80cda6c22cfe4219c4767a5b2a50b65790852de9f33ce0c16122fd EBUILD xen-tools-4.1.2.ebuild 10815 RMD160 5daa042810bd3a639cde7bd3adf81279a9adb802 SHA1 e7d97ae1a1a7187bacc86764568c44df70a4b60e SHA256 0822c802e370685414c4642dfbe12f28f82f42e184e5113b7d368fd5db073a3b EBUILD xen-tools-9999.ebuild 9517 RMD160 a1fa4abc0c2a8cf160d05fd699f3b2ded872f113 SHA1 ae51b976fe1f07152444e0f1b01e8e513e8ce215 SHA256 bd832962adbf6388ed7d44530587596f97543a6596bc59b5593bff7c972bc926 -MISC ChangeLog 25980 RMD160 4d9ea067183e7010078e96b02bffe521b1b69a07 SHA1 0888bd94936f1d88d382de7086882fb274910c53 SHA256 58bb0e2e62709c5fc061c75a7a67ab646001d81de5c346f5d2012ad595fbb1ce +MISC ChangeLog 26087 RMD160 0ee4a0c3129d992615aaec7912489d5c749f1f6a SHA1 12032b9007d9edde819c51e454c832ec6c18e6fa SHA256 69d41670a8144082c96ad6a62800763c2961dffdcff9009f3daf98c02a5dd25d MISC metadata.xml 947 RMD160 96890462f83ee4a47c9c77993ba76ef82a732af5 SHA1 7ff424eead47cb6ce81930c10d3b22b0d8f73d61 SHA256 74f0e5bea356989a42fd4086d87271ed7c25331306acb333707476f53cac4d60 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJOuBX/AAoJEOf+E+/4L5LmhoEP/1eI0TfJyWr0vOLJPDI0YxJI -p35ldtzisoZonXY69MpUtaWdVxverU6qfdNhP1ya+VQSNi2/ZboJleWkh0995zQ1 -lsCYUv55lKcCfWudQU/7C+CTO/6yfI8DKtBfnPcv0yuHMRBvoL2WokNs3q1NByLD -szX/TShfaU1j7QZzsXpFxnT0c8uDoEL0LG9ICA1RSIXHf8tSOJwDvZDJCDVHJrYE -5JGtaxpOXhrqtWeTxdK1XtOH2ZLJGjrkgshhJHEg2yxzuRNYEY9p1nlCOI1vb6l+ -R57n7lvsbCS97WoM/7gsZEoBSuf7e6ys//3fgckRvuB88YlKh/KH2llmqhOaADow -tH+nHVgKo1iHjtBfd+DL1JARVnuni5Y4Qh2Rj6rh1/agcjWUgaveRpumgLJvlcA9 -IVm8FIKe/V0P3ePCm1mzTqhg6RdsojW1ctoCEAiT3PdPBkKOBa6vVImnri2T2Jdc -LzRwN0eC06Qx0WyzGPI0lxNUlq2zxV7YMuSZq8w0e1jUQ5alXFwmadlSa59bHxy3 -UMv+TQqNZYb5DMnaZ6v2A1F0MJOfms1PLtc7wD6VKJUs3xTd0F8MreikpCdLdlej -MESNudpfpw7prlstKNHv7uA5s0s8+slDVj5GYKflmUxAAcpDbDXcHONxOh0/+kZ7 -EmhN74XUcGxEogi8nCp1 -=moaP +iQIcBAEBCAAGBQJOu75oAAoJEOf+E+/4L5LmWVsP/3RKFmOy6eD4muXiqoUItTw5 +MGJOp0Gcau0aQU4EittWc4liZFMTSTxVu8pkgO+amAUin9u1FBUm+nv9MBCB0VTf +IGTd8SPZfy3RJsE9a1kTRvyfW9ECvPYAfy8q2kc5rE4KKHkJLJqwcz2rm+SU5wjr +diryC2oHWI21yE1fBX7Oml39g/4aHLTAzPv4w6J7dmJThYRoyq2T3E8ZjpQPYwNK +MYMZfz7IA6Ok7L/N06iA15KbsaBErzqhF5VALk2AROXpwjfqKmZoGvlcPOwG1lPe +JdZWvwVs6kVBk3+CaJv6pEE/I6Ni+NTetnkT1Eo6EuX53gbDXXjs71Vrbh25beqR +sjxH1nfEbxpUdUqQ8NSlaaqpA4BhKTCtQUaGu52gqsyewhuBb2sHlc/r5xsCMWal +KrCkEaR0XvqPOkcH97jVOrqj6BBHymdFkLP7jcrame9ai0goR/Hqjqzful4gp+N5 +dBXeYP6XJsePvDYBVIU0UQwuoMtVAy5HhnH64K9Gi3VDxO6a8mah0yNzHFBKlD1e +rxi9GaYmTReLSiQOuY8jjcX9MgmlO6tRL+BWLkhuKm+2sX3Yn3oXCRfKUDOsMMey +Q4Lpik0zPgXMnXrCaWsYBC5jSuPfaTZbFHrsBMGnC+UUW7xNeLgTfBnZgVsXgtD2 +xAfXiqHUP1BM8GtBfDT3 +=aISy -----END PGP SIGNATURE----- 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 = [] -- 2.26.2