From mboxrd@z Thu Jan 1 00:00:00 1970 From: Syunsuke HAYASHI Subject: Re: [PATCH] [XM] Fix the display of the __NULL_LABEL__ Date: Wed, 14 Nov 2007 14:25:01 +0900 Message-ID: <473A86AD.1010908@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050201080905070605090601" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------050201080905070605090601 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit 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 > > > > > > > >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 --------------050201080905070605090601 Content-Type: text/plain; name="xm_list_labels_remove_null_label.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="xm_list_labels_remove_null_label.patch" ZGlmZiAtciAwYzI1MzU0MDc4MjggdG9vbHMvcHl0aG9uL3hlbi91dGlsL3hzbS9hY20vYWNt LnB5Ci0tLSBhL3Rvb2xzL3B5dGhvbi94ZW4vdXRpbC94c20vYWNtL2FjbS5weSAgICAgIE1v biBPY3QgMDggMDk6NDA6NDkgMjAwNyArMDEwMAorKysgYi90b29scy9weXRob24veGVuL3V0 aWwveHNtL2FjbS9hY20ucHkgICAgICBXZWQgTm92IDE0IDExOjQwOjExIDIwMDcgKzA5MDAK QEAgLTYwMCw0ICs2MDAsOCBAQCBkZWYgbGlzdF9sYWJlbHMocG9saWN5X25hbWUsIGNvbmRp dGlvbik6CiAgICAgICAgICAgICBsYWJlbCA9IGxpbmUuc3BsaXQoKVszXQogICAgICAgICAg ICAgaWYgbGFiZWwgbm90IGluIGxhYmVsczoKICAgICAgICAgICAgICAgICBsYWJlbHMuYXBw ZW5kKGxhYmVsKQorICAgIGYuY2xvc2UoKQorICAgIGlmICdfX05VTExfTEFCRUxfXycgaW4g bGFiZWxzOgorICAgICAgICBsYWJlbHMucmVtb3ZlKCdfX05VTExfTEFCRUxfXycpCisKICAg ICByZXR1cm4gbGFiZWxzCgoK --------------050201080905070605090601 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------050201080905070605090601--