[Cluster-devel] conga ./conga.spec.in.in luci/site/luci/Extens ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-08-17 20:26:32

Modified files:
	.              : conga.spec.in.in 
	luci/site/luci/Extensions: LuciClusterActions.py LuciDB.py 
	                           LuciZope.py 

Log message:
	Fixed bz249291 (delete node task fails to do all items listed in the help document)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.55&r2=1.45.2.56
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterActions.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.3&r2=1.1.4.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciDB.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.4&r2=1.1.4.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciZope.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.3&r2=1.1.4.4

--- conga/conga.spec.in.in	2007/08/15 14:38:18	1.45.2.55
+++ conga/conga.spec.in.in	2007/08/17 20:26:31	1.45.2.56
@@ -310,6 +310,10 @@
 
 ###  changelog ###
 %changelog
+* Fri Aug 17 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-5
+* Fixed bz249291 (delete node task fails to do all items listed in the help document)
+- Resolves: bz249291
+
 * Mon Aug 13 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-4
 - Fixed bz230451 (fence_xvm.key file is not automatically created. Should have a least a default)
 - Fixed bz249097 (allow a space as a valid password char)
--- conga/luci/site/luci/Extensions/LuciClusterActions.py	2007/07/26 04:20:59	1.1.4.3
+++ conga/luci/site/luci/Extensions/LuciClusterActions.py	2007/08/17 20:26:32	1.1.4.4
@@ -364,6 +364,10 @@
 				exclude_names=[ nodename_resolved ], exclude_busy=True)
 
 		if rc2 is None:
+			rc2 = getRicciAgent(self, clustername,
+					exclude_names=[ nodename_resolved ])
+
+		if rc2 is None:
 			if LUCI_DEBUG_MODE is True:
 				luci_log.debug_verbose('ND0: unable to find ricci agent to delete %s from %s' % (nodename_resolved, clustername))
 			return None
@@ -589,9 +593,11 @@
 def NodeFence(self, clustername, nodename, nodename_resolved):
 	rc = getRicciAgent(self, clustername,
 			exclude_names=[ nodename_resolved, nodename ], exclude_busy=True)
+
 	if rc is None:
 		rc = getRicciAgent(self, clustername,
 				exclude_names=[ nodename_resolved, nodename ])
+
 	if rc is None:
 		if LUCI_DEBUG_MODE is True:
 			luci_log.debug_verbose('FNF0: no ricci to fence %s for cluster %s' \
@@ -636,6 +642,7 @@
 
 	if rc is None:
 		rc = getRicciAgent(self, clustername, exclude_busy=True)
+
 	if rc is None:
 		rc = getRicciAgent(self, clustername)
 
--- conga/luci/site/luci/Extensions/LuciDB.py	2007/07/26 04:20:59	1.1.4.4
+++ conga/luci/site/luci/Extensions/LuciDB.py	2007/08/17 20:26:32	1.1.4.5
@@ -852,7 +852,7 @@
 			continue
 
 		if exclude_busy is True:
-			if NodeBusy(self, cluname, ricci_hostname, rc) is not False:
+			if NodeBusy(self, clustername, ricci_hostname, rc) is not False:
 				if LUCI_DEBUG_MODE is True:
 					luci_log.debug_verbose('GRA13: %s is busy, excluding' \
 						% ricci_hostname)
@@ -861,7 +861,7 @@
 
 	if LUCI_DEBUG_MODE is True:
 		luci_log.debug('GRA14: no ricci agent could be found for cluster %s' \
-			% cluname)
+			% clustername)
 	return None
 
 def getClusterDBObj(self, clustername):
--- conga/luci/site/luci/Extensions/LuciZope.py	2007/08/08 21:14:38	1.1.4.3
+++ conga/luci/site/luci/Extensions/LuciZope.py	2007/08/17 20:26:32	1.1.4.4
@@ -126,7 +126,7 @@
 
 def GetReqVars(req, varlist):
 	ret = {}
-	from types import ListType;
+	from types import ListType
 
 	for i in varlist:
 		pval = None