aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-08-11 08:55:47 +0000
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-08-11 08:55:47 +0000
commit2f403612d8c765dbed2bb69a76de447390de95fd (patch)
tree71f56fcb56154e364344fedf3927bb24b41bef4d
parent3a264694de8d68abc19c1057f49200ec5e6428b4 (diff)
downloadxen-2f403612d8c765dbed2bb69a76de447390de95fd.tar.gz
xen-2f403612d8c765dbed2bb69a76de447390de95fd.tar.bz2
xen-2f403612d8c765dbed2bb69a76de447390de95fd.zip
The attached patch fixes the xm list command, which very
recently stopped working if security was enabled. xm list fails if security is enabled because of a single additional "%" character in a print. Signed-off-by: Reiner Sailer <sailer@watson.ibm.com>
-rw-r--r--tools/python/xen/xm/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 55e77e0f43..c1779d33a2 100644
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -265,7 +265,7 @@ def xm_brief_list(domsinfo):
print 'Name Id Mem(MB) CPU VCPU(s) State Time(s)'
for dominfo in domsinfo:
if dominfo.has_key("ssidref1"):
- print ("%(name)-16s %(dom)3d %(mem)7d %(cpu)3s %(vcpus)5d %(state)5s %(cpu_time)7.1f %s:%(ssidref2)02x/p:%(ssidref1)02x" % dominfo)
+ print ("%(name)-16s %(dom)3d %(mem)7d %(cpu)3s %(vcpus)5d %(state)5s %(cpu_time)7.1f s:%(ssidref2)02x/p:%(ssidref1)02x" % dominfo)
else:
print ("%(name)-16s %(dom)3d %(mem)7d %(cpu)3s %(vcpus)5d %(state)5s %(cpu_time)7.1f" % dominfo)