[PATCH] Fix xm labels

[PATCH] Fix xm labels

[Syunsuke HAYASHI]

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

Hi,

This patch fixes "xm labels type=any" command error.

When the command "xm labels type=any" was input, the label of the
resource was not displayed before.
So,I fixed it.

Thanks,

Signed-off-by: Syunsuke HAYASHI <syunsuke@jp.fujitsu.com>



[-- Attachment #2: xm_labels.patch --]
[-- Type: text/plain, Size: 713 bytes --]

diff -r b28ae5f00553 tools/python/xen/xm/labels.py
--- a/tools/python/xen/xm/labels.py	Tue Oct 23 09:26:43 2007 +0100
+++ b/tools/python/xen/xm/labels.py	Fri Oct 26 11:11:36 2007 +0900
@@ -98,11 +98,8 @@ def labels_xapi(policy, ptype):
             names1 = acmpol.policy_get_virtualmachinelabel_names()
         if ptype == 'res' or ptype == 'any':
             names2 = acmpol.policy_get_resourcelabel_names()
-        if len(names1) > 0:
-            names = set(names1)
-            names.union(names2)
-        else:
-            names = set(names2)
+        names = list(set(names1).union(names2))
+        names.sort()
         for n in names:
             print n
     elif int(policystate['type']) == 0:

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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