[Checkins] SVN: z3ext.controlpanel/trunk/ Fixed migration script for multiple databases

[Nikolay Kim]

Log message for revision 91869:
  Fixed migration script for multiple databases

Changed:
  U   z3ext.controlpanel/trunk/CHANGES.txt
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/generations/install.py
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/site.txt

-=-
Modified: z3ext.controlpanel/trunk/CHANGES.txt
===================================================================
--- z3ext.controlpanel/trunk/CHANGES.txt	2008-10-07 16:07:30 UTC (rev 91868)
+++ z3ext.controlpanel/trunk/CHANGES.txt	2008-10-07 16:12:45 UTC (rev 91869)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.3.1 (2008-10-07)
+------------------
+
+- Fixed migration script for multiple databases
+
+
 1.3.0 (2008-10-07)
 ------------------
 

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/generations/install.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/generations/install.py	2008-10-07 16:07:30 UTC (rev 91868)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/generations/install.py	2008-10-07 16:12:45 UTC (rev 91869)
@@ -49,10 +49,12 @@
             configlet = ConfigletData()
             event.notify(ObjectCreatedEvent(storage))
             storage[name] = configlet
-            
+
             for n, v in cdata.items():
+                if hasattr(v, '_p_jar'):
+                    if storage._p_jar is not v._p_jar:
+                        v = copy(v)
+
                 configlet[n] = v
 
-            print configlet
-
         del ann['z3ext.controlpanel.Settings']

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/site.txt
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/site.txt	2008-10-07 16:07:30 UTC (rev 91868)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/site.txt	2008-10-07 16:12:45 UTC (rev 91869)
@@ -28,7 +28,6 @@
   >>> setSite(site)
 
   >>> configlet = component.getUtility(IConfiglet)
-  >>> configlet, configlet.data
 
   >>> myutility = Folder()
   >>> interface.directlyProvides(myutility, IMyUtility)