[Erp5-report] r44369 rafael - /erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/

[nobody at svn.erp5.org]

Author: rafael
Date: Wed Mar 16 20:18:51 2011
New Revision: 44369

URL: http://svn.erp5.org?rev=44369&view=rev
Log:
No not fail due XMLRPC failures, only verbose. Make sure the bt5s are or will be present into the site.

Modified:
    erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/erp5.py

Modified: erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/erp5.py
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/erp5.py?rev=44369&r1=44368&r2=44369&view=diff
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/erp5.py [utf8] (original)
+++ erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/erp5.py [utf8] Wed Mar 16 20:18:51 2011
@@ -45,7 +45,6 @@ def updateERP5(args):
   if len(bt5_list) > 0 and len(bt5_repository_list) == 0:
     bt5_repository_list = ["http://www.erp5.org/dists/snapshot/bt5"]
   erp5_catalog_storage = "erp5_mysql_innodb_catalog"
-  erp5_site_created = 0
   business_template_setup_finished = 0
   sleep = 60
   while True:
@@ -58,10 +57,9 @@ def updateERP5(args):
           "erp5_catalog_storage": erp5_catalog_storage,
           "erp5_sql_connection_string": mysql_string,
           "cmf_activity_sql_connection_string": mysql_string, }))
-        erp5_site_created = 1
         print "ERP5 Site creation output: %s" % result.read()
 
-      if erp5_site_created and not business_template_setup_finished:
+      if not business_template_setup_finished:
         if proxy.isERP5SitePresent() == True:
           print "Start to set initial business template setup."
           # Update URL to ERP5 Site
@@ -82,7 +80,8 @@ def updateERP5(args):
                 installBusinessTemplatesFromRepositories([bt5])
 
           repository_set = set(erp5.portal_templates.getRepositoryList())
-          installed_bt5_list = erp5.portal_templates.getInstalledBusinessTemplateTitleList()
+          installed_bt5_list = erp5.portal_templates.\
+               getInstalledBusinessTemplateTitleList()
           if (set(repository_set) == set(bt5_repository_list)) and \
               len([i for i in bt5_list if i not in installed_bt5_list]) == 0:
             print "Repositories updated and business templates installed."
@@ -94,4 +93,6 @@ def updateERP5(args):
       print "Unable to create the ERP5 Site!"
     except socket.error, e:
       print "Unable to connect to ZOPE! %s" % e
+    except xmlrpclib.Fault, e:
+      print "XMLRPC Fault: %s" % e
     time.sleep(sleep)