xm: fix "xm labels type=any" command error

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

diff --git a/tools/python/xen/xm/labels.py b/tools/python/xen/xm/labels.py
index bce0d22f7e4c9060ff39219ab68919addb39dc77..b8f676d70a4070cd25f233e32f2973d8ea8565d5 100644 (file)
--- a/tools/python/xen/xm/labels.py
+++ b/tools/python/xen/xm/labels.py
@@ -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: