From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 3 Aug 2006 18:41:55 -0000
Subject: [Cluster-devel] conga/luci/utils luci_cleanup
Message-ID: <20060803184155.22239.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-03 18:41:54

Modified files:
	luci/utils     : luci_cleanup 

Log message:
	nits

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_cleanup.diff?cvsroot=cluster&r1=1.2&r2=1.3

--- conga/luci/utils/luci_cleanup	2006/08/03 18:33:54	1.2
+++ conga/luci/utils/luci_cleanup	2006/08/03 18:41:54	1.3
@@ -116,7 +116,7 @@
 		passwd = rand.read(16)
 		rand.close()
 	except:
-		sys.stderr.write('Unable to read from /dev/urandom')
+		sys.stderr.write('Unable to read from /dev/urandom\n')
 		return -1
 
 	try:
@@ -137,10 +137,11 @@
 		member_list = map(lambda x: x.id, membertool.listMembers())
 		membertool.deleteMembers(member_list)
 	transaction.commit()
-	user_items = app.luci.acl_users.source_users.objectItems()
 
+	user_items = app.luci.acl_users.source_users.objectItems()
 	if user_items and len(user_items):
 		app.luci.acl_users.source_users.manage_delObjects(map(lambda x: x[0], user_items))
+		transaction.commit()
 
 	app.luci.portal_memberdata.pruneMemberDataContents()
 	transaction.commit()
@@ -159,6 +160,7 @@
 			cluster.manage_delObjects(map(lambda x: x[0], cluster_items))
 			transaction.commit()
 
+	transaction.commit()
 	conn.close()
 	db.pack()
 	db.close()