[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	2008-04-18 20:34:51

Modified files:
	.              : conga.spec.in.in 
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	Fix bz443152

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.81&r2=1.45.2.82
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.120.2.43&r2=1.120.2.44

--- conga/conga.spec.in.in	2008/04/18 04:15:52	1.45.2.81
+++ conga/conga.spec.in.in	2008/04/18 20:34:50	1.45.2.82
@@ -292,6 +292,7 @@
 ###  changelog ###
 %changelog
 * Thu Apr 10 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-8
+- Fix bz443152 (Exception generated when adding or updating failover domains)
 - Fix bz441580 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used)
 - Fix bz441573 ("nodename" field for fence_scsi disabled when adding a new fence device/instance)
 - Fix bz442997 (Luci inserts "hostname" instead of "ipaddr" for rsa II fencing device)
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2008/03/12 15:13:12	1.120.2.43
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2008/04/18 20:34:50	1.120.2.44
@@ -1017,7 +1017,7 @@
 			luci_log.debug_verbose('validateFdom0: no model')
 		return (False, { 'errors': [ 'Unable to retrieve the cluster configuration for %s. The configuration XML may contain errors' % clustername ]})
 
-	ret = validate_fdom(self, request)
+	ret = validate_fdom(model, request)
 	if ret[0] is not True:
 		return ret