From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 4 Oct 2006 16:20:22 -0000 Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ... Message-ID: <20061004162022.8527.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 2006-10-04 16:20:22 Modified files: luci/site/luci/Extensions: cluster_adapters.py Log message: python punctuation pedantry Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.82&r2=1.83 --- conga/luci/site/luci/Extensions/cluster_adapters.py 2006/10/04 16:05:43 1.82 +++ conga/luci/site/luci/Extensions/cluster_adapters.py 2006/10/04 16:20:22 1.83 @@ -139,10 +139,10 @@ if cluster_properties['isComplete'] == True: from ricci_communicator import RicciCommunicator - rc = RicciCommunicator(nodeList[0]['ricci_host']) - os_str = resolveOSType(rc.os()) - if os_str == None: - os_str = "rhel5" #Backup plan in case all is almost lost... + rc = RicciCommunicator(nodeList[0]['ricci_host']) + os_str = resolveOSType(rc.os()) + if os_str == None: + os_str = "rhel5" #Backup plan in case all is almost lost... batchNode = createClusterBatch(os_str, clusterName, clusterName, map(lambda x: x['ricci_host'], nodeList), True, False, False) if not batchNode: @@ -159,7 +159,7 @@ return (False, {'errors': errors, 'requestResults':cluster_properties }) batch_id_map = {} - rc = None + rc = None for i in nodeList: try: rc = RicciCommunicator(i['ricci_host']) @@ -2169,7 +2169,7 @@ ricci_agent = resolve_nodename(self, clustername, ragent) rc = RicciCommunicator(ricci_agent) map = {} - os_str = resolveOSType(rc.os()) + os_str = resolveOSType(rc.os()) map['os'] = os_str map['isVirtualized'] = rc.dom0() return map