From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 29 Jan 2007 23:30:04 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
Message-ID: <20070129233004.17493.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
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-29 23:30:01

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 
	                           homebase_adapters.py 

Log message:
	allow external gulm lockservers to be removed in the GULM preferences tab

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.214&r2=1.215
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/homebase_adapters.py.diff?cvsroot=cluster&r1=1.47&r2=1.48

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/01/29 16:56:50	1.214
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/01/29 23:30:00	1.215
@@ -1147,7 +1147,10 @@
 	gulm_ptr = model.getGULMPtr()
 	if not gulm_ptr:
 		return (False, {'errors': [ 'This cluster appears not to be using GULM locking.' ]})
-	node_list = map(lambda x: x.getName(), model.getNodes())
+	node_list = map(lambda x: x.getName(), gulm_ptr.getChildren())
+	for i in map(lambda x: x.getName(), model.getNodes()):
+		if not i in node_list:
+			node_list.append(i)
 
 	gulm_lockservers = list()
 	for node in node_list:
@@ -3365,9 +3368,11 @@
     lockserv_list = list()
     clunodes = model.getNodes()
     gulm_lockservs = map(lambda x: x.getName(), gulm_ptr.getChildren())
+    lockserv_list = map(lambda x: (x, True), gulm_lockservs)
     for node in clunodes:
       n = node.getName()
-      lockserv_list.append((n, n in gulm_lockservs))
+      if not n in gulm_lockservs:
+        lockserv_list.append((n, False))
     clumap['gulm'] = True
     clumap['gulm_url'] = prop_baseurl + PROPERTIES_TAB + '=' + PROP_GULM_TAB
     clumap['gulm_lockservers'] = lockserv_list
--- conga/luci/site/luci/Extensions/homebase_adapters.py	2007/01/29 22:06:02	1.47
+++ conga/luci/site/luci/Extensions/homebase_adapters.py	2007/01/29 23:30:00	1.48
@@ -571,7 +571,7 @@
 				if not prev_auth:
 					try:
 						rc.unauth()
-					except:
+					except Exception, e:
 						luci_log.debug_verbose('VAC4: %s: %s' % (cur_host, str(e)))
 
 				errors.append(err_msg)