From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 3 Aug 2006 03:58:24 -0000
Subject: [Cluster-devel] conga/luci/utils luci_admin
Message-ID: <20060803035824.31217.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 03:58:23

Modified files:
	luci/utils     : luci_admin 

Log message:
	fix restore

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

--- conga/luci/utils/luci_admin	2006/08/03 03:30:02	1.34
+++ conga/luci/utils/luci_admin	2006/08/03 03:58:23	1.35
@@ -426,7 +426,7 @@
 
 		x.manage_addFolder(id, title)
 		try:
-			new_system = eval('app.luci.systems.storage.' + id)
+			new_system = app.luci.systems.storage.get(id)
 			if not new_system:
 				raise
 			new_system.manage_acquiredPermissions([])
@@ -487,7 +487,7 @@
 
 		try:
 			x.manage_addFolder(id, title)
-			new_cluster = eval('app.luci.systems.cluster.' + id)
+			new_cluster = app.luci.systems.cluster.get(id)
 
 			if not new_cluster:
 				raise
@@ -535,7 +535,7 @@
 
 				try:
 					new_cluster.manage_addFolder(newsys, stitle)
-					newcs = eval('app.luci.systems.cluster.' + id + '.' + newsys)
+					newcs = app.luci.systems.cluster.get(id).get(newsys)
 					if not newcs:
 						raise
 					newcs.manage_acquiredPermissions([])
@@ -723,7 +723,6 @@
 	except:
 		pass
 		
-
 	try:
 		storagedir = app.luci.systems.storage
 		clusterdir = app.luci.systems.cluster