[Zope-CVS] CVS: Products/AdaptableStorage - Zope2FS.py:1.16.2.6 Zope2Mapper.py:1.3.2.6 Zope2SQL.py:1.7.2.6 patches.py:1.2.2.5

[Christian Zagrodnick]

Update of /cvs-repository/Products/AdaptableStorage
In directory cvs.zope.org:/tmp/cvs-serv14413

Modified Files:
      Tag: zagy-patches
	Zope2FS.py Zope2Mapper.py Zope2SQL.py patches.py 
Log Message:
merging HEAD into zagy-patches branch

=== Products/AdaptableStorage/Zope2FS.py 1.16.2.5 => 1.16.2.6 ===


=== Products/AdaptableStorage/Zope2Mapper.py 1.3.2.5 => 1.3.2.6 ===
--- Products/AdaptableStorage/Zope2Mapper.py:1.3.2.5	Tue Feb  4 12:29:34 2003
+++ Products/AdaptableStorage/Zope2Mapper.py	Thu Feb  6 08:01:04 2003
@@ -176,6 +176,7 @@
 
     # Other stuff
     classifier.register('CMF Skins Tool', 'anyfile')  # XXX workaround
+    classifier.register('Control Panel', 'anyfile')   # XXX workaround
 
     return root_mapper
 


=== Products/AdaptableStorage/Zope2SQL.py 1.7.2.5 => 1.7.2.6 ===


=== Products/AdaptableStorage/patches.py 1.2.2.4 => 1.2.2.5 ===
--- Products/AdaptableStorage/patches.py:1.2.2.4	Tue Feb  4 12:29:34 2003
+++ Products/AdaptableStorage/patches.py	Thu Feb  6 08:01:04 2003
@@ -65,8 +65,9 @@
 def applySetObPatch():
     # Fall back to copying when move/rename is not possible.
     def _setOb(self, id, object):
-        if getattr(self, '_use_fixed_oids_', 0):
-            if object._p_oid is not None:
+        if object._p_oid is not None:
+            if (getattr(self, '_use_fixed_oids_', 0) or (
+                object._p_jar is not None and object._p_jar != self._p_jar)):
                 old = object
                 # Forget changes to the original object
                 old._p_changed = 0