[Erp5-report] r39070 rafael - in /erp5/trunk/bt5/erp5_upgrader: SkinTemplateItem/portal_ski...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Oct 12 20:37:43 CEST 2010
Author: rafael
Date: Tue Oct 12 20:37:43 2010
New Revision: 39070
URL: http://svn.erp5.org?rev=39070&view=rev
Log:
Allow alarm_dict on upgrader signature to disable some alarms.
Modified:
erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml
erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseProductVersion.xml
erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseSystemVersion.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/bt/revision
Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml?rev=39070&r1=39069&r2=39070&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml [utf8] Tue Oct 12 20:37:43 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>
@@ -62,6 +59,10 @@
# Setup skins\n
context.ERP5Site_setupUpgraderSkinSelection()\n
\n
+alarm_dict = context.ERP5Site_getUpgraderSignature("alarm_dict")\n
+if not alarm_dict.get(context.getId(), True):\n
+ return False\n
+\n
# Verify if is required upgrade Global Site Properties. \n
if len(context.ERP5Site_upgradeGlobalPropertyList()) > 0:\n
return True\n
@@ -137,9 +138,10 @@ return False\n
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
- <string>len</string>
+ <string>alarm_dict</string>
<string>True</string>
<string>False</string>
+ <string>len</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseProductVersion.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseProductVersion.xml?rev=39070&r1=39069&r2=39070&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseProductVersion.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseProductVersion.xml [utf8] Tue Oct 12 20:37:43 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>
@@ -58,6 +55,10 @@
"""\n
Here we make sure the installed products are the right ones\n
"""\n
+alarm_dict = context.ERP5Site_getUpgraderSignature("alarm_dict")\n
+if not alarm_dict.get(context.getId(), True):\n
+ return False\n
+\n
# check if upgrade is needed\n
return len(context.ERP5Site_upgradeProductPath()) > 0\n
@@ -99,9 +100,12 @@ return len(context.ERP5Site_upgradeProdu
<value>
<tuple>
<string>kw</string>
- <string>len</string>
<string>_getattr_</string>
<string>context</string>
+ <string>alarm_dict</string>
+ <string>True</string>
+ <string>False</string>
+ <string>len</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseSystemVersion.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseSystemVersion.xml?rev=39070&r1=39069&r2=39070&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseSystemVersion.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseSystemVersion.xml [utf8] Tue Oct 12 20:37:43 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,10 @@
Here we make sure the all required system libraries are installed in\n
appropriate version.\n
"""\n
+alarm_dict = context.ERP5Site_getUpgraderSignature("alarm_dict")\n
+if not alarm_dict.get(context.getId(), True):\n
+ return False\n
+\n
# Verify if upgrade is required for Python\n
if len(context.ERP5Site_upgradePythonExecutable()) > 0:\n
return True\n
@@ -107,11 +108,12 @@ return False\n
<value>
<tuple>
<string>kw</string>
- <string>len</string>
<string>_getattr_</string>
<string>context</string>
+ <string>alarm_dict</string>
<string>True</string>
<string>False</string>
+ <string>len</string>
</tuple>
</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=39070&r1=39069&r2=39070&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 Oct 12 20:37:43 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>
@@ -61,6 +58,10 @@
# Setup skins\n
context.ERP5Site_setupUpgraderSkinSelection()\n
\n
+alarm_dict = context.ERP5Site_getUpgraderSignature("alarm_dict")\n
+if not alarm_dict.get(context.getId(), True):\n
+ return False\n
+\n
portal_alarms = context.getPortalObject().portal_alarms\n
activate = context.portal_activities.activate\n
# Group Messages into the same active process.\n
@@ -133,6 +134,9 @@ return message_list\n
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
+ <string>alarm_dict</string>
+ <string>True</string>
+ <string>False</string>
<string>portal_alarms</string>
<string>activate</string>
<string>active_process</string>
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=39070&r1=39069&r2=39070&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 20:37:43 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,8 +56,20 @@
The release signature is a kind of declarative\n
specification of an upgrader.\n
"""\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" : True,\n
+ "product_upgrader" : True,\n
+ "bt5_upgrader" : True,\n
+ "finalize_upgrader" : True\n
+}\n
+\n
# The destination release provided by this upgrader\n
-DESTINATION_RELEASE = \'5.4.7\'\n
+DESTINATION_RELEASE = \'5.4.6\'\n
\n
ZOPE_VERSION = "2.8.11"\n
\n
@@ -527,8 +536,10 @@ UPGRADE_OBJECT_CLASS_LIST = ( (\'portal_
\n
# Wrap everything into a dict\n
signature_dict = {\n
+ # Defines the alarms enabled for the upgrade\n
+ \'alarm_dict\' : ALARM_DICT\n
# Defines the default release for bt5\n
- \'release\': DESTINATION_RELEASE\n
+ , \'release\': DESTINATION_RELEASE\n
# Defines the default version for zope\n
, \'zope\': ZOPE_VERSION\n
# Defines the default version for python\n
@@ -608,6 +619,8 @@ else:\n
<value>
<tuple>
<string>item</string>
+ <string>True</string>
+ <string>ALARM_DICT</string>
<string>DESTINATION_RELEASE</string>
<string>ZOPE_VERSION</string>
<string>PYTHON_VERSION</string>
Modified: erp5/trunk/bt5/erp5_upgrader/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/bt/revision?rev=39070&r1=39069&r2=39070&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] Tue Oct 12 20:37:43 2010
@@ -1 +1 @@
-531
\ No newline at end of file
+532
\ No newline at end of file
More information about the Erp5-report
mailing list