From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 4 Aug 2006 19:19:10 -0000
Subject: [Cluster-devel] conga/luci/utils luci_admin
Message-ID: <20060804191910.11602.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	2006-08-04 19:19:10

Modified files:
	luci/utils     : luci_admin 

Log message:
	fix set password issue for rhel

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=cluster&r1=1.44&r2=1.45

--- conga/luci/utils/luci_admin	2006/08/04 18:43:26	1.44
+++ conga/luci/utils/luci_admin	2006/08/04 19:19:10	1.45
@@ -121,13 +121,13 @@
 	import transaction
 	import Products.CMFCore
 	import Products.CMFCore.MemberDataTool
-	import ImageFile
+	import App.ImageFile
 	import Products.PluggableAuthService.plugins.ZODBUserManager
 	import BTrees.OOBTree
 	# Zope wants to open a www/ok.gif and images/error.gif
 	# when you initialize the application object. This keeps
 	# the AppInitializer(app).initialize() call below from failing.
-	ImageFile.ImageFile.__init__ = lambda x,y,z:None
+	App.ImageFile.__init__ = lambda x, y: None
 	sys.stderr = orig_stderr
 
 	try:
@@ -254,11 +254,11 @@
 	import transaction
 	import Products.CMFCore
 	import Products.CMFCore.MemberDataTool
-	import ImageFile
+	import App.ImageFile
 	import Products.PluggableAuthService.plugins.ZODBUserManager
 	import BTrees.OOBTree
 	from DateTime import DateTime
-	ImageFile.ImageFile.__init__ = lambda x,y,z:None
+	App.ImageFile.__init__ = lambda x, y: None
 	sys.stderr = orig_stderr
 
 	if len(argv) > 0:
@@ -636,10 +636,10 @@
 	import Products.CMFCore
 	import Products.CMFCore.MemberDataTool
 	from CMFPlone.utils import getToolByName
-	import ImageFile
+	import App.ImageFile
 	import Products.PluggableAuthService.plugins.ZODBUserManager
 	import BTrees.OOBTree
-	ImageFile.ImageFile.__init__ = lambda x,y,z:None
+	App.ImageFile.__init__ = lambda x, y: None
 	sys.stderr = orig_stderr
 
 	if len(argv) > 0: