From 6c9ec94d0c9303316ad8f3347532eabf31ca8316 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Fri, 17 Dec 2010 11:49:00 +0000 Subject: Code reviewed --- plugins/xenapi/etc/xapi.d/plugins/objectstore | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore index e17f1ba13..8ee2f748d 100644 --- a/plugins/xenapi/etc/xapi.d/plugins/objectstore +++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore @@ -48,7 +48,7 @@ def is_vdi_pv(session,args): vdi = exists(args, 'vdi-ref') pv=with_vdi_in_dom0(session, vdi, False, lambda dev: _is_vdi_pv('/dev/%s' % dev)) - if (pv): + if pv: return 'true' else: return 'false' @@ -58,11 +58,10 @@ def _is_vdi_pv(dest): output=os.popen('pygrub -qn %s' % dest) pv=False for line in output.readlines(): - #logging.debug("line:",line) #try to find kernel string m=re.search('(?<=kernel:)/.*(?:>)',line) - if (m<>None): - if m.group(0).find('xen')<>-1: + if m: + if m.group(0).find('xen')!=-1: pv=True logging.debug("PV:%d",pv) return pv -- cgit