From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 19 Jan 2007 20:57:39 -0000 Subject: [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py Message-ID: <20070119205739.11996.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: rmccabe at sourceware.org 2007-01-19 20:57:38 Modified files: luci/site/luci/Extensions: FenceHandler.py Log message: return the new fence name when a fence device is added or edited, as it may have been changed to comply with the naming requirements imposed by the relax-ng schema Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.13&r2=1.14 --- conga/luci/site/luci/Extensions/FenceHandler.py 2007/01/19 19:41:26 1.13 +++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/01/19 20:57:38 1.14 @@ -209,7 +209,7 @@ fencedevptr = model.getFenceDevicePtr() fencedevptr.addChild(fencedev) model.setModified(True) - return (FD_VAL_SUCCESS, FD_NEW_SUCCESS % FENCE_OPTS[fencedev.getAttribute('agent')]) + return (FD_VAL_SUCCESS, fencedev.getAttribute('name')) except Exception, e: ret = FD_PROVIDE_AGENT @@ -239,7 +239,7 @@ ret = validate_fencedevice(form, model, fencedev, fence_edit=True) if ret is None: model.setModified(True) - return (FD_VAL_SUCCESS, FD_UPDATE_SUCCESS % FENCE_OPTS[fencedev.getAttribute('name')]) + return (FD_VAL_SUCCESS, fencedev.getAttribute('name')) except Exception, e: ret = FD_PROVIDE_NAME