More commented-out code, pending a solution to the xml.marshall.generic

problem.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xm/addlabel.py b/tools/python/xen/xm/addlabel.py
index a688d10d0a58d0660fe46aa7edb7c6b81cd013ed..e3966c9f59dd6040f1338083e1b7372313118d1d 100644 (file)
--- a/tools/python/xen/xm/addlabel.py
+++ b/tools/python/xen/xm/addlabel.py
@@ -22,7 +22,7 @@
 import sys, os
 import string
 import traceback
-from xml.marshal import generic
+#from xml.marshal import generic
 from xen.util import security
 
 def usage():
@@ -88,7 +88,7 @@ def add_resource_label(label, resource, policyref):
             access_control = {}
         else:
             fd = open(file, "rb")
-            access_control = generic.load(fd)
+#            access_control = generic.load(fd)
             fd.close()
 
         if access_control.has_key(resource):
@@ -98,7 +98,7 @@ def add_resource_label(label, resource, policyref):
         new_entry = { resource : tuple([policyref, label]) }
         access_control.update(new_entry)
         fd = open(file, "wb")
-        generic.dump(access_control, fd)
+#        generic.dump(access_control, fd)
         fd.close()
 
     except security.ACMError:

diff --git a/tools/python/xen/xm/getlabel.py b/tools/python/xen/xm/getlabel.py
index 33e2553b57797c5adcdc65ae558eee34046e9c4b..e1c62d473aba8e719d26a79620f7f3eed92896fc 100644 (file)
--- a/tools/python/xen/xm/getlabel.py
+++ b/tools/python/xen/xm/getlabel.py
@@ -21,7 +21,7 @@
 import sys, os, re
 import string
 import traceback
-from xml.marshal import generic
+#from xml.marshal import generic
 from xen.util import security
 
 def usage():
@@ -38,7 +38,7 @@ def get_resource_label(resource):
         file = security.res_label_filename
         if os.path.isfile(file):
             fd = open(file, "rb")
-            access_control = generic.load(fd)
+#            access_control = generic.load(fd)
             fd.close()
         else:
             print "Resource label file not found"

diff --git a/tools/python/xen/xm/resources.py b/tools/python/xen/xm/resources.py
index 6163a3b75938b985c32fbe9a8b8f22839ce56c4d..0108fed8f9f7b45a868c6713d4ed78abf9cefe63 100644 (file)
--- a/tools/python/xen/xm/resources.py
+++ b/tools/python/xen/xm/resources.py
@@ -21,7 +21,7 @@
 import sys, os
 import string
 import traceback
-from xml.marshal import generic
+#from xml.marshal import generic
 from xen.util import security
 
 def usage():
@@ -48,7 +48,7 @@ def get_resource_data():
         security.err("Resource file not found.")
 
     fd = open(file, "rb")
-    access_control = generic.load(fd)
+#    access_control = generic.load(fd)
     fd.close()
     return access_control
 

diff --git a/tools/python/xen/xm/rmlabel.py b/tools/python/xen/xm/rmlabel.py
index cac110490885c411c54c4cdd354754a1d2c81343..c031ab3f87c6305dc0f0c63f42723a13436b7d54 100644 (file)
--- a/tools/python/xen/xm/rmlabel.py
+++ b/tools/python/xen/xm/rmlabel.py
@@ -21,7 +21,7 @@
 import sys, os, re
 import string
 import traceback
-from xml.marshal import generic
+#from xml.marshal import generic
 from xen.util import security
 
 def usage():
@@ -41,7 +41,7 @@ def rm_resource_label(resource):
         file = security.res_label_filename
         if os.path.isfile(file):
             fd = open(file, "rb")
-            access_control = generic.load(fd)
+#            access_control = generic.load(fd)
             fd.close()
         else:
             security.err("Resource file not found, cannot remove label!")
@@ -50,7 +50,7 @@ def rm_resource_label(resource):
         if access_control.has_key(resource):
             del access_control[resource]
             fd = open(file, "wb")
-            generic.dump(access_control, fd)
+#            generic.dump(access_control, fd)
             fd.close()
         else:
             security.err("Label does not exist in resource label file.")