add more check for update

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4911 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/ERP5Site.py

@@ -714,6 +714,7 @@ class ERP5Generator(PortalGenerator):
           p._delObject('portal_catalog')
 
         # Add CMF Report Tool
+        if not p.hasObject('portal_report'):
           addTool = p.manage_addProduct['CMFReportTool'].manage_addTool
           addTool('CMF Report Tool', None)
 
@@ -731,7 +732,7 @@ class ERP5Generator(PortalGenerator):
           self.setupTemplateTool(p)
         if not p.hasObject('portal_trash'):
           addTool('ERP5 Trash Tool', None)
-        if not p.hasObject('portal_alarm'):
+        if not p.hasObject('portal_alarms'):
           addTool('ERP5 Alarm Tool', None)
         if not p.hasObject('portal_domains'):
           addTool('ERP5 Domain Tool', None)
@@ -865,7 +866,6 @@ class ERP5Generator(PortalGenerator):
         business_template_installation_workflow = os.path.join(bootstrap_dir,
                                                                'business_template_installation_workflow.xml')
         tool._importObjectFromFile(business_template_installation_workflow)
-
         tool.setChainForPortalTypes( ( 'Business Template', ),
                                      ( 'business_template_building_workflow',
                                        'business_template_installation_workflow' ) )
@@ -992,7 +992,7 @@ class ERP5Generator(PortalGenerator):
 
         if not p.hasObject('content_type_registry'):
           self.setupMimetypes(p)
-          
+        if not update:
           self.setupWorkflow(p)
 
         if not update: