[Erp5-report] r39075 rafael - in /erp5/trunk/bt5/erp5_upgrader: SkinTemplateItem/portal_ski...

[nobody at svn.erp5.org]

Author: rafael
Date: Tue Oct 12 22:22:23 2010
New Revision: 39075

URL: http://svn.erp5.org?rev=39075&view=rev
Log:
Define in upgrader signature if site will be recatalogued or NOT. By default it will be.

Modified:
    erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
    erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeSQLCatalog.xml
    erp5/trunk/bt5/erp5_upgrader/bt/revision

Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml?rev=39075&r1=39074&r2=39075&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml [utf8] Tue Oct 12 22:22:23 2010
@@ -539,6 +539,8 @@ UPGRADE_OBJECT_CLASS_LIST = ( (\'portal_
                           \'Products.ERP5Type.Document.Gadget.Gadget\', \n
                           \'ERP5Site_testUpgradeObjectClass\'  ), )\n
 \n
+RECATALOG = True\n
+\n
 # Wrap everything into a dict\n
 signature_dict = {\n
    # Defines the alarms enabled for the upgrade\n
@@ -580,6 +582,8 @@ signature_dict = {\n
  , \'erp5_site_property_dict\' : ERP5_SITE_PROPERTY_DICT\n
    # Provide a list of tuples with informations to upgrade object class\n
  , \'upgrade_object_class_list\' : UPGRADE_OBJECT_CLASS_LIST\n
+   # Define if the site will be recatalogued or not after finish upgrade.\n
+ , \'recatalog\' : RECATALOG\n
 }\n
 \n
 if item is not None:\n
@@ -650,6 +654,7 @@ else:\n
                             <string>INTEGRITY_VERIFICATION_SCRIPT_ID_LIST</string>
                             <string>ERP5_SITE_PROPERTY_DICT</string>
                             <string>UPGRADE_OBJECT_CLASS_LIST</string>
+                            <string>RECATALOG</string>
                             <string>signature_dict</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeSQLCatalog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeSQLCatalog.xml?rev=39075&r1=39074&r2=39075&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeSQLCatalog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeSQLCatalog.xml [utf8] Tue Oct 12 22:22:23 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,9 @@
   standard way to detect if the SQLUpgrade is needed. Reindexation should \n
   be only a consequence of other script only.\n
 """\n
+signature = context.ERP5Site_getUpgraderSignature()\n
+if not signature.get("recatalog", True):\n
+  return []\n
 \n
 if not upgrade:\n
   # Never consider outdated.\n
@@ -123,9 +123,11 @@ return message_list\n
                         <value>
                           <tuple>
                             <string>upgrade</string>
-                            <string>message_list</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>signature</string>
+                            <string>True</string>
+                            <string>message_list</string>
                             <string>catalog</string>
                             <string>tag</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_upgrader/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/bt/revision?rev=39075&r1=39074&r2=39075&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] Tue Oct 12 22:22:23 2010
@@ -1 +1 @@
-535
\ No newline at end of file
+536
\ No newline at end of file