[Erp5-report] r43175 kazuhiko - in /erp5/trunk/bt5/erp5_upgrader: PathTemplateItem/portal_a...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Feb  8 14:25:24 2011
New Revision: 43175

URL: http://svn.erp5.org?rev=43175&view=rev
Log:
remove system_upgrader and product_upgrader completely.

Modified:
    erp5/trunk/bt5/erp5_upgrader/PathTemplateItem/portal_alarms/upgrader_controller.xml
    erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeBT5Version.xml
    erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
    erp5/trunk/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py
    erp5/trunk/bt5/erp5_upgrader/bt/revision

Modified: erp5/trunk/bt5/erp5_upgrader/PathTemplateItem/portal_alarms/upgrader_controller.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/PathTemplateItem/portal_alarms/upgrader_controller.xml?rev=43175&r1=43174&r2=43175&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/PathTemplateItem/portal_alarms/upgrader_controller.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/PathTemplateItem/portal_alarms/upgrader_controller.xml [utf8] Tue Feb  8 14:25:24 2011
@@ -21,10 +21,8 @@
         <item>
             <key> <string>description</string> </key>
             <value> <string>This alarms acts as a cron job. It will start an instance upgrade if any of the following this alarms sequence:\n
-1) system_upgrader (supported)\n
-2) product_upgrader (supported)\n
-3) bt5_upgrader (supported)\n
-4) finalize_upgrader (supported)\n
+1) bt5_upgrader (supported)\n
+2) finalize_upgrader (supported)\n
 \n
 "sense" a need of an upgrade. This alarm is likely to disappear soon as it\'s needed due to lack of functionality (which is that alarms can not automatically "solve" themselves).</string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeBT5Version.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeBT5Version.xml?rev=43175&r1=43174&r2=43175&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeBT5Version.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeBT5Version.xml [utf8] Tue Feb  8 14:25:24 2011
@@ -73,18 +73,6 @@ active_process = active_process.getPath(
 \n
 message_list = []\n
 \n
-system_upgrader_sense = portal_alarms.system_upgrader.sense()\n
-product_upgrader_sense = portal_alarms.product_upgrader.sense()\n
-\n
-if system_upgrader_sense and product_upgrader_sense:\n
-  activate(active_process=active_process,\n
-           activity=\'SQLQueue\',\n
-           priority=2).Alarm_saveActiveResult(\n
-              summary="ERROR: Upgrade BT5 not started",\n
-              severity=0,\n
-              detail=\'System Upgrader Sense: %s , Product Upgrader Sense : %s\' \\\n
-                       % ( system_upgrader_sense, product_upgrader_sense))\n
-\n
 # update existing bt5\n
 message_list.extend(context.ERP5Site_upgradeBusinessTemplateList(upgrade=1))\n
 \n

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=43175&r1=43174&r2=43175&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 Feb  8 14:25:24 2011
@@ -58,12 +58,8 @@
 """\n
 \n
 # Alarm dict is used to enable/disable upgrade alarms.\n
-# ie.: If you don\'t want upgrade products in some environments\n
-# you can just define \'product_upgrader\' : False.\n
 \n
 ALARM_DICT = {\n
- "system_upgrader" : False,\n
- "product_upgrader" : False,\n
  "bt5_upgrader" : True,\n
  "finalize_upgrader" : True\n
 }\n

Modified: erp5/trunk/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py?rev=43175&r1=43174&r2=43175&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py [utf8] Tue Feb  8 14:25:24 2011
@@ -118,8 +118,6 @@ class TestLiveUpgrader(ERP5TypeLiveTestC
     self.assertEquals(signature['alarm_tool_configuration_list'], ())
 
     # By default we upgrade software, products, bt5 and so on.
-    self.assertTrue(signature['alarm_dict']["system_upgrader"])
-    self.assertTrue(signature['alarm_dict']["product_upgrader"])
     self.assertTrue(signature['alarm_dict']["bt5_upgrader"])
     self.assertTrue(signature['alarm_dict']["finalize_upgrader"])
 

Modified: erp5/trunk/bt5/erp5_upgrader/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/bt/revision?rev=43175&r1=43174&r2=43175&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] Tue Feb  8 14:25:24 2011
@@ -1 +1 @@
-569
\ No newline at end of file
+570
\ No newline at end of file