# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 767ce4b6dd480bfcdacc73db0878a5cdf604afd9
# Parent ca3f2a137159115ab507681d070e07419b0b03dc
More commented-out code, pending a solution to the xml.marshall.generic
problem.
Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
tools/python/xen/xm/addlabel.py | 6 +++---
tools/python/xen/xm/getlabel.py | 4 ++--
tools/python/xen/xm/resources.py | 4 ++--
tools/python/xen/xm/rmlabel.py | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff -r ca3f2a137159 -r 767ce4b6dd48 tools/python/xen/xm/addlabel.py
--- a/tools/python/xen/xm/addlabel.py Wed Jun 28 17:36:38 2006 +0100
+++ b/tools/python/xen/xm/addlabel.py Wed Jun 28 17:42:05 2006 +0100
@@ -22,7 +22,7 @@ import sys, os
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,
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,
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 -r ca3f2a137159 -r 767ce4b6dd48 tools/python/xen/xm/getlabel.py
--- a/tools/python/xen/xm/getlabel.py Wed Jun 28 17:36:38 2006 +0100
+++ b/tools/python/xen/xm/getlabel.py Wed Jun 28 17:42:05 2006 +0100
@@ -21,7 +21,7 @@ import sys, os, re
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 -r ca3f2a137159 -r 767ce4b6dd48 tools/python/xen/xm/resources.py
--- a/tools/python/xen/xm/resources.py Wed Jun 28 17:36:38 2006 +0100
+++ b/tools/python/xen/xm/resources.py Wed Jun 28 17:42:05 2006 +0100
@@ -21,7 +21,7 @@ import sys, os
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 -r ca3f2a137159 -r 767ce4b6dd48 tools/python/xen/xm/rmlabel.py
--- a/tools/python/xen/xm/rmlabel.py Wed Jun 28 17:36:38 2006 +0100
+++ b/tools/python/xen/xm/rmlabel.py Wed Jun 28 17:42:05 2006 +0100
@@ -21,7 +21,7 @@ import sys, os, re
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.")
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home