ia64/xen-unstable

changeset 10581:ca3f2a137159

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@xensource.com>
author emellor@leeni.uk.xensource.com
date Wed Jun 28 17:36:38 2006 +0100 (2006-06-28)
parents d85488fd2196
children 767ce4b6dd48
files tools/python/xen/util/security.py
line diff
     1.1 --- a/tools/python/xen/util/security.py	Wed Jun 28 16:22:38 2006 +0100
     1.2 +++ b/tools/python/xen/util/security.py	Wed Jun 28 17:36:38 2006 +0100
     1.3 @@ -22,7 +22,7 @@ import logging
     1.4  import sys, os, string, re
     1.5  import traceback
     1.6  import shutil
     1.7 -from xml.marshal import generic
     1.8 +#from xml.marshal import generic
     1.9  from xen.lowlevel import acm
    1.10  from xen.xend import sxp
    1.11  from xen.xend.XendLogging import log
    1.12 @@ -555,13 +555,16 @@ def get_res_label(resource):
    1.13      if not os.path.isfile(configfile):
    1.14          log.info("Resource label file not found.")
    1.15          return default_res_label()
    1.16 -    fd = open(configfile, "rb")
    1.17 -    res_label_cache = generic.load(fd)
    1.18 -    fd.close()
    1.19 +#
    1.20 +# Commented out pending replacement for xml.marshal.generic
    1.21 +#
    1.22 +#     fd = open(configfile, "rb")
    1.23 +#     res_label_cache = generic.load(fd)
    1.24 +#     fd.close()
    1.25  
    1.26 -    # find the resource information
    1.27 -    if res_label_cache.has_key(resource):
    1.28 -        (policy, label) = res_label_cache[resource]
    1.29 +#     # find the resource information
    1.30 +#     if res_label_cache.has_key(resource):
    1.31 +#         (policy, label) = res_label_cache[resource]
    1.32  
    1.33      return (label, policy)
    1.34