[Xen-changelog] [xen-unstable] Comment out the load of the resource label file, pending a solution to the

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID ca3f2a137159115ab507681d070e07419b0b03dc
# Parent  d85488fd2196fb09c46cefb298f10577bb077aff
Comment out the load of the resource label file, pending a solution to the
problem that we now require xml.marshal.generic.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/python/xen/util/security.py |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff -r d85488fd2196 -r ca3f2a137159 tools/python/xen/util/security.py
--- a/tools/python/xen/util/security.py Wed Jun 28 16:22:38 2006 +0100
+++ b/tools/python/xen/util/security.py Wed Jun 28 17:36:38 2006 +0100
@@ -22,7 +22,7 @@ import sys, os, string, re
 import sys, os, string, re
 import traceback
 import shutil
-from xml.marshal import generic
+#from xml.marshal import generic
 from xen.lowlevel import acm
 from xen.xend import sxp
 from xen.xend.XendLogging import log
@@ -555,13 +555,16 @@ def get_res_label(resource):
     if not os.path.isfile(configfile):
         log.info("Resource label file not found.")
         return default_res_label()
-    fd = open(configfile, "rb")
-    res_label_cache = generic.load(fd)
-    fd.close()
-
-    # find the resource information
-    if res_label_cache.has_key(resource):
-        (policy, label) = res_label_cache[resource]
+#
+# Commented out pending replacement for xml.marshal.generic
+#
+#     fd = open(configfile, "rb")
+#     res_label_cache = generic.load(fd)
+#     fd.close()
+
+#     # find the resource information
+#     if res_label_cache.has_key(resource):
+#         (policy, label) = res_label_cache[resource]
 
     return (label, policy)
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog