CVSROOT:        /cvs/cluster
Module name:    conga
Changes by:     [EMAIL PROTECTED]       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):

Reply via email to