[Checkins] SVN: Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to22.py - use a different check for the metadata definition upgrade checker

Jens Vagelpohl jens at dataflake.org
Wed Dec 9 12:20:14 EST 2009


Log message for revision 106345:
  - use a different check for the metadata definition upgrade checker
  

Changed:
  U   Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to22.py

-=-
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to22.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to22.py	2009-12-09 16:28:50 UTC (rev 106344)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to22.py	2009-12-09 17:20:14 UTC (rev 106345)
@@ -307,16 +307,17 @@
     """2.1.x to 2.2.0 upgrade step checker
     """
     metadata_tool = getToolByName(tool, 'portal_metadata')
-    return getattr(aq_base(metadata_tool), '_DCMI', None) is not None
+    return getattr(aq_base(metadata_tool), 'DCMI', None) is None
 
 def upgrade_dcmi_metadata(tool):
     """2.1.x to 2.2.0 upgrade step handler
     """
     logger = logging.getLogger('GenericSetup.upgrade')
     metadata_tool = getToolByName(tool, 'portal_metadata')
-    dcmi = metadata_tool._DCMI
-    del metadata_tool._DCMI
-    metadata_tool.DCMI = dcmi
+    if getattr(aq_base(metadata_tool), 'DCMI', None) is None:
+        dcmi = metadata_tool._DCMI
+        del metadata_tool._DCMI
+        metadata_tool.DCMI = dcmi
     logger.info('Dublin Core metadata definition updated.')
 
 



More information about the checkins mailing list