Re: [PATCH] [XM] Fix the display of the __NULL_LABEL__

[Syunsuke HAYASHI <syunsuke@jp.fujitsu.com>]

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

Hi,

I think the security.py was changed to acm.py.
http://xenbits.xensource.com/staging/xen-unstable.hg?rev=security.py

This patch fixes the problem.

The result is shown as follows.
--------When xen-api is not effective-------
# xm labels type=any
dom_BoincClient              <---- __NULL_LABEL__ is removed.
dom_Fun
dom_HomeBanking
dom_NetworkDomain
dom_StorageDomain
dom_SystemManagement
res_EthernetCard
res_GraphicsAdapter
res_HardDrive(hda)
res_ImageFile1
res_ImageFile2
res_LogicalDiskPartition1(hda1)
res_LogicalDiskPartition2(hda2)
res_ManagementResource
--------------------------------------------

Thanks

Syunsuke HAYASHI

> >No longer display the __NULL_LABEL__ on the list of labels.
> >
> >Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
> >
> >
> >
> >Index: root/xen-unstable.hg/tools/python/xen/util/security.py
> >===================================================================
> >--- root.orig/xen-unstable.hg/tools/python/xen/util/security.py
> >+++ root/xen-unstable.hg/tools/python/xen/util/security.py
> >@@ -608,6 +608,11 @@ def list_labels(policy_name, condition):
> >             label = line.split()[3]
> >             if label not in labels:
> >                 labels.append(label)
> >+
> >+    f.close()
> >+    if '__NULL_LABEL__' in labels:
> >+        labels.remove('__NULL_LABEL__')
> >+
> >     return labels
> >
> >
> >
> >
> >
> >
> >_______________________________________________
> >Xen-devel mailing list
> >Xen-devel@lists.xensource.com
> >http://lists.xensource.com/xen-devel
> >
> >



diff -r 0c2535407828 tools/python/xen/util/xsm/acm/acm.py
--- a/tools/python/xen/util/xsm/acm/acm.py      Mon Oct 08 09:40:49 2007
+0100
+++ b/tools/python/xen/util/xsm/acm/acm.py      Wed Nov 14 11:40:11 2007
+0900
@@ -600,4 +600,8 @@ def list_labels(policy_name, condition):
             label = line.split()[3]
             if label not in labels:
                 labels.append(label)
+    f.close()
+    if '__NULL_LABEL__' in labels:
+        labels.remove('__NULL_LABEL__')
+
     return labels




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

diff -r 0c2535407828 tools/python/xen/util/xsm/acm/acm.py
--- a/tools/python/xen/util/xsm/acm/acm.py      Mon Oct 08 09:40:49 2007 +0100
+++ b/tools/python/xen/util/xsm/acm/acm.py      Wed Nov 14 11:40:11 2007 +0900
@@ -600,4 +600,8 @@ def list_labels(policy_name, condition):
             label = line.split()[3]
             if label not in labels:
                 labels.append(label)
+    f.close()
+    if '__NULL_LABEL__' in labels:
+        labels.remove('__NULL_LABEL__')
+
     return labels



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

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