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

[nobody at svn.erp5.org]

Author: rafael
Date: Fri Jan 14 18:05:23 2011
New Revision: 42355

URL: http://svn.erp5.org?rev=42355&view=rev
Log:
Ignore this upgrade if Key is None.

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

Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeSQLCatalogFilter.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeSQLCatalogFilter.xml?rev=42355&r1=42354&r2=42355&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeSQLCatalogFilter.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeSQLCatalogFilter.xml [utf8] Fri Jan 14 18:05:23 2011
@@ -51,6 +51,11 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>message_list = []\n
+expect_expression_dict = context.ERP5Site_getUpgraderSignature(\'catalog_filter_dict\')\n
+if expect_expression_dict is None:\n
+  # If key is not provided, ignore.\n
+  return []\n
+\n
 catalog = context.portal_catalog.erp5_mysql_innodb\n
 \n
 filter_dict = catalog.getFilterDict()\n
@@ -58,8 +63,6 @@ catalog_filter_dict = {}\n
 for key in filter_dict:\n
   catalog_filter_dict[key] = filter_dict[key][\'expression\']\n
 \n
-expect_expression_dict = context.ERP5Site_getUpgraderSignature(\'catalog_filter_dict\')\n
-\n
 # test if keys are the same\n
 for key in expect_expression_dict:\n
   if expect_expression_dict[key] != catalog_filter_dict[key]:\n
@@ -78,77 +81,13 @@ return message_list\n
 </string> </value>
         </item>
         <item>
-            <key> <string>_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
             <key> <string>_params</string> </key>
             <value> <string>upgrade=0</string> </value>
         </item>
         <item>
-            <key> <string>errors</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_code</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>co_varnames</string> </key>
-                        <value>
-                          <tuple>
-                            <string>upgrade</string>
-                            <string>message_list</string>
-                            <string>_getattr_</string>
-                            <string>context</string>
-                            <string>catalog</string>
-                            <string>filter_dict</string>
-                            <string>catalog_filter_dict</string>
-                            <string>_getiter_</string>
-                            <string>key</string>
-                            <string>_getitem_</string>
-                            <string>_write_</string>
-                            <string>expect_expression_dict</string>
-                          </tuple>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_defaults</string> </key>
-            <value>
-              <tuple>
-                <int>0</int>
-              </tuple>
-            </value>
-        </item>
-        <item>
             <key> <string>id</string> </key>
             <value> <string>ERP5Site_upgradeSQLCatalogFilter</string> </value>
         </item>
-        <item>
-            <key> <string>warnings</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>

Modified: erp5/trunk/bt5/erp5_upgrader/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/bt/revision?rev=42355&r1=42354&r2=42355&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] Fri Jan 14 18:05:23 2011
@@ -1 +1 @@
-559
\ No newline at end of file
+562
\ No newline at end of file