From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 2 Jan 2008 21:06:32 -0000
Subject: [Cluster-devel] conga/luci load_site.py
Message-ID: <20080102210632.26244.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	2008-01-02 21:06:31

Modified files:
	luci           : load_site.py 

Log message:
	*.vpy and *.cpt files are not properly imported, so skip them

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/load_site.py.diff?cvsroot=cluster&r1=1.17&r2=1.18

--- conga/luci/load_site.py	2007/09/11 16:04:32	1.17
+++ conga/luci/load_site.py	2008/01/02 21:06:31	1.18
@@ -3,7 +3,7 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# Copyright (C) 2006-2007 Red Hat, Inc.
+# Copyright (C) 2006-2008 Red Hat, Inc.
 #
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -173,16 +173,18 @@
 	dbid = name.split('.')[0]
 
 	try:
-		call(nobject.manage_addControllerPythonScript, id=dbid, file=open(f,'rb'))
-		if verbose: print 'Uploaded', dbid
+		raise Exception, 'Not supported'
+		#call(nobject.manage_addControllerPythonScript, id=dbid, file=open(f,'rb'))
+		#if verbose: print 'Uploaded', dbid
 	except:
 		if verbose: print name, 'exists trying to delete then upload again'
 		try:
 			call(object.manage_delObjects, ids=[dbid])
 			if verbose: print 'Deleted', dbid
 			try:
-				call(nobject.manage_addControllerPythonScript, id=dbid, file=open(f,'rb'))
-				if verbose: print 'Uploaded', dbid
+				raise Exception, 'Not supported'
+				#call(nobject.manage_addControllerPythonScript, id=dbid, file=open(f,'rb'))
+				#if verbose: print 'Uploaded', dbid
 			except: print 'Unable to upload', dbid
 		except: print 'Unable to delete', dbid
 
@@ -196,17 +198,20 @@
 	dbid = name.split('.')[0]
 
 	try:
-		call(nobject.manage_addControllerPageTemplate, id=dbid, file=open(f,'rb'))
-		if verbose: print 'Uploaded', dbid
+		raise Exception, 'Not supported'
+		#call(nobject.manage_addControllerPageTemplate, id=dbid, file=open(f,'rb'))
+		#if verbose: print 'Uploaded', dbid
 	except:
 		if verbose: print name, 'exists trying to delete then upload again'
 		try:
 			call(object.manage_delObjects, ids=[dbid])
 			if verbose: print 'Deleted', dbid
 			try:
-				call(nobject.manage_addControllerPageTemplate, id=dbid, file=open(f,'rb'))
-				if verbose: print 'Uploaded', dbid
-			except: print 'Unable to upload', dbid
+				raise Exception, 'Not supported'
+				#call(nobject.manage_addControllerPageTemplate, id=dbid, file=open(f,'rb'))
+				#if verbose: print 'Uploaded', dbid
+			except:
+				print 'Unable to upload', dbid
 		except: print 'Unable to delete', dbid
 
 def upload_pt(object, f):