[Testbot] Plone 4.3 - Python 2.7 - Build # 2035 - Still failing! - 2 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 4.3 - Python 2.7 - Build # 2035 - Still Failing!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-4.3-python-2.7/2035/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: plone.app.upgrade
Branch: refs/heads/master
Date: 2014-03-11T21:34:17-05:00
Author: Nathan Van Gheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/plone.app.upgrade/commit/656e39c82f7bca0f82a5b8d7993aa87d26d03410

upgrade plone.protect keyrings

Files changed:
M CHANGES.txt
M plone/app/upgrade/v50/alphas.py
M plone/app/upgrade/v50/configure.zcml

diff --git a/CHANGES.txt b/CHANGES.txt
index 0cbdc78..f4b90b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Changelog
 1.3.7 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- provide upgrade step for plone.protect
+  [vangheem]
 
 
 1.3.6 (2014-03-02)
diff --git a/plone/app/upgrade/v50/alphas.py b/plone/app/upgrade/v50/alphas.py
index bf9ecda..03bccf7 100644
--- a/plone/app/upgrade/v50/alphas.py
+++ b/plone/app/upgrade/v50/alphas.py
@@ -1,4 +1,11 @@
 # -*- coding: utf-8 -*-
+from Acquisition import aq_parent, aq_base
+from plone.keyring.interfaces import IKeyManager
+from plone.keyring.keyring import Keyring
+from plone.keyring.keymanager import KeyManager
+from zope.component import getUtility
+from zope.component import getSiteManager
+from zope.component.hooks import getSite
 from Products.CMFCore.utils import getToolByName
 from plone.app.upgrade.utils import loadMigrationProfile
 from plone.app.upgrade.v40.alphas import cleanUpToolRegistry
@@ -46,6 +53,16 @@ def to50alpha1(context):
         if not qi.isProductInstalled('plonetheme.barceloneta'):
             qi.installProduct('plonetheme.barceloneta')
 
+    # update the default view of the Members folder
+    migrate_members_default_view(portal)
+
+    # install the Barceloneta theme
+    if portal.portal_skins.getDefaultSkin() == 'Sunburst Theme':
+        if not qi.isProductInstalled('plonetheme.barceloneta'):
+            qi.installProduct('plonetheme.barceloneta')
+
+    upgrade_keyring(context)
+
 
 def lowercase_email_login(context):
     """If email is used as login name, lowercase the login names.
@@ -82,3 +99,26 @@ def migrate_members_default_view(portal):
     if 'index_html' in members:
         del members['index_html']
     members.layout = '@@member-search'
+
+
+def upgrade_keyring(context):
+    logger.info('upgrading keyring')
+    manager = getUtility(IKeyManager)
+
+    manager[u'_system'].fill()
+
+    if u'_anon' not in manager:
+        manager[u'_anon'] = Keyring()
+    manager[u'_anon'].fill()
+
+    if u'_forms' not in manager:
+        manager[u'_forms'] = Keyring()
+    manager[u'_forms'].fill()
+
+    logger.info('add keyring to zope root if not done already')
+    app = aq_parent(getSite())
+    sm = getSiteManager(app)
+
+    if sm.queryUtility(IKeyManager) is None:
+        obj = KeyManager()
+        sm.registerUtility(aq_base(obj), IKeyManager, '')
diff --git a/plone/app/upgrade/v50/configure.zcml b/plone/app/upgrade/v50/configure.zcml
index cf0959b..0619a7c 100644
--- a/plone/app/upgrade/v50/configure.zcml
+++ b/plone/app/upgrade/v50/configure.zcml
@@ -11,11 +11,11 @@
         destination="5000"
         profile="Products.CMFPlone:plone">
 
-      <gs:upgradeStep
-          title="Run to50alpha1 upgrade profile"
-          description=""
-          handler=".alphas.to50alpha1"
-          />
+       <gs:upgradeStep
+           title="Run to50alpha1 upgrade profile"
+           description=""
+           handler=".alphas.to50alpha1"
+           />
 
       <gs:upgradeStep
           title="Use lowercase for email login"




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 3470 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140312/a0bbc220/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 78141 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140312/a0bbc220/attachment-0003.obj>