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

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-04-28 03:49:08

Modified files:
	.              : conga.spec.in.in 
	luci/site/luci/Extensions: ResourceHandler.py 
	make           : version.in 

Log message:
	- Fix bz444195 (conga writes 'exportpath' instead of 'export' attribute for netfs)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.27&r2=1.67.2.28
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.2.2&r2=1.2.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.28.2.12&r2=1.28.2.13

--- conga/conga.spec.in.in	2008/04/21 18:15:17	1.67.2.27
+++ conga/conga.spec.in.in	2008/04/28 03:49:07	1.67.2.28
@@ -300,6 +300,9 @@
 
 
 %changelog
+* Mon Apr 29 2008 Ryan McCabe <rmccabe at redhat.com> 0.11.1-4
+- Fix bz444195 (conga writes 'exportpath' instead of 'export' attribute for netfs)
+
 * Fri Apr 18 2008 Ryan McCabe <rmccabe at redhat.com> 0.11.1-3
 - Fix bz442729 (Add UI support for ssh for fence agents that now support it)
 
--- conga/luci/site/luci/Extensions/ResourceHandler.py	2008/03/25 01:27:12	1.2.2.2
+++ conga/luci/site/luci/Extensions/ResourceHandler.py	2008/04/28 03:49:07	1.2.2.3
@@ -271,10 +271,10 @@
 			luci_log.debug_verbose('addNfsm7: %s' % err)
 
 	try:
-		exportpath = form['exportpath'].strip()
+		exportpath = form['export'].strip()
 		if not exportpath:
 			raise Exception, 'No export path was given for "%s"' % rname
-		res.addAttribute('exportpath', exportpath)
+		res.addAttribute('export', exportpath)
 	except Exception, e:
 		err = str(e)
 		errors.append(err)
--- conga/make/version.in	2008/04/21 18:16:00	1.28.2.12
+++ conga/make/version.in	2008/04/28 03:49:07	1.28.2.13
@@ -1,2 +1,2 @@
 VERSION=0.11.1
-RELEASE=3
+RELEASE=4