[Erp5-report] r44658 luke - in /erp5/trunk/bt5/erp5_upgrader: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: luke
Date: Mon Mar 28 10:53:34 2011
New Revision: 44658

URL: http://svn.erp5.org?rev=44658&view=rev
Log:
 - simplify erp5_upgrader logic -- do not try to detect if
   ERP5Site_upgradeSQLCatalog shall be called or not, just add it in
   default signature

Note: It would be always added, as message_list would always be above 0,
but in many ares of use of upgrader finalize_upgrade_script_list shall
be defined, but never with reindexing/dropping catalog.

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

Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeFinalize.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeFinalize.xml?rev=44658&r1=44657&r2=44658&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeFinalize.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeFinalize.xml [utf8] Mon Mar 28 10:53:34 2011
@@ -50,9 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-"""\n
+            <value> <string>"""\n
   Finalize Upgrade is the final step of upgrader. Here should contains\n
   the scripts that should be executed after the business template installation.\n
 """\n
@@ -85,11 +83,6 @@ if bt5_upgrader_sense:\n
 for script_id in context.ERP5Site_getUpgraderSignature().get(\'finalize_upgrade_script_list\', []):\n
   message_list.extend(getattr(context, script_id)(upgrade=1))\n
 \n
-# Verify if there was any change previously and \n
-if len(message_list) > 0:\n
- message_list.extend(context.ERP5Site_upgradeSQLCatalog(upgrade=1))\n
- clear_cache_kw[\'after_tag\'] = \'tag_migration_finish\'\n
-\n
 activate(active_process=active_process,\n
            activity=\'SQLQueue\',\n
            priority=2).Alarm_saveActiveResult(summary="Finalize Upgrade",\n
@@ -105,9 +98,7 @@ activate(active_process=active_process,\
            after_tag=clear_cache_kw[\'tag\']).ERP5Site_notifyUpgradeIntegrity(active_process=active_process)\n
 \n
 return message_list\n
-
-
-]]></string> </value>
+</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

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=44658&r1=44657&r2=44658&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] Mon Mar 28 10:53:34 2011
@@ -267,6 +267,7 @@ FINALIZE_ALARM_SCRIPT = ( \'ERP5Site_upg
                           \'ERP5Site_upgradeObjectClass\',\n
                           \'ERP5Site_upgradeSQLCatalogFilter\',\n
                           \'ERP5Site_upgradeAlarmToolConfiguration\',\n
+                          \'ERP5Site_upgradeSQLCatalog\',\n
                         )\n
 \n
 # \n

Modified: erp5/trunk/bt5/erp5_upgrader/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/bt/revision?rev=44658&r1=44657&r2=44658&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] Mon Mar 28 10:53:34 2011
@@ -1 +1 @@
-584
\ No newline at end of file
+585
\ No newline at end of file