Changeset 2836 in products for quintagroup.plonegooglesitemaps/branches/migratioin_product/quintagroup/plonegooglesitemaps/setuphandlers.py

Timestamp:

Sep 20, 2010 12:37:00 PM (14 years ago)

Author:

mylan

Message:

#230: Fix cleanup during migration from the qPloneGoogleSitemaps

File:

• quintagroup.plonegooglesitemaps/branches/migratioin_product/quintagroup/plonegooglesitemaps/setuphandlers.py (modified) (3 diffs)

quintagroup.plonegooglesitemaps/branches/migratioin_product/quintagroup/plonegooglesitemaps/setuphandlers.py

@@ -80 +80 @@
     controlpanel = getToolByName(site, 'portal_controlpanel')
     # Remove old configlet from controlpanel
-    controlpanel.unregisterConfiglet(old_product)
-    logger.info("Unregistered '%s' configlet from "\
-                "portal_controlpanel tool" % old_product)
+    configlet_ids = [ai['id'] for ai in controlpanel.listActionInfos()]
+    if old_product in configlet_ids:
+        controlpanel.unregisterConfiglet(old_product)
+        logger.info("Unregistered '%s' configlet from "\
+                    "portal_controlpanel tool" % old_product)
     # Remove qPloneGoogleSitemaps skin layer
     for skinName in skins.getSkinSelections():
         skin_paths = skins.getSkinPath(skinName).split(',') 
         paths = [l.strip() for l in skin_paths if not l == old_product]
-        logger.info("Removed '%s' from '%s' skin." % (old_product, skinName))
+        if len(paths) < len(skin_paths):
+            logger.info("Removed '%s' from '%s' skin." % (old_product, skinName))
         skins.addSkinSelection(skinName, ','.join(paths))
 
@@ -113 +116 @@
             new_sm.at_post_create_script()
             logger.info("Successfully replaced '%s' Sitemap" % sm_path)
-    else:
-        logger.info(msg + "No sitemaps found")
 
 def getOldGSitemaps(site):
@@ -132 +133 @@
 
     site = context.getSite()
+    cleanup(site)
     old_gsmaps = getOldGSitemaps(site)
     if old_gsmaps:
-        cleanup(site)
         recriateSitemaps(old_gsmaps)
         logger.info("Successfully migrated old GoogleSitemaps.")