r568 - in zope-common/trunk: . debian

[Fabio Tranchitella]

Author: kobold
Date: 2007-01-08 09:22:04 +0100 (Mon, 08 Jan 2007)
New Revision: 568

Modified:
   zope-common/trunk/debian/changelog
   zope-common/trunk/dzhandle
Log:
Changes for the new debian release.


Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2007-01-02 10:44:33 UTC (rev 567)
+++ zope-common/trunk/debian/changelog	2007-01-08 08:22:04 UTC (rev 568)
@@ -1,3 +1,10 @@
+zope-common (0.5.29) unstable; urgency=high
+
+  * dzhandle: fixed a bug which causes broken upgrade for global zope3
+    products.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Mon,  8 Jan 2007 09:21:04 +0100
+
 zope-common (0.5.28) unstable; urgency=medium
 
   [ Jérémy Bobbio ]

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2007-01-02 10:44:33 UTC (rev 567)
+++ zope-common/trunk/dzhandle	2007-01-08 08:22:04 UTC (rev 568)
@@ -708,7 +708,8 @@
                                   % (iaddon.kind, iaddon.name, instance.name))
                         
                 else:
-                    assert iaddon.type in (ADDON_LINKED, ADDON_TREELINKED)
+                    assert iaddon.type in (ADDON_LINKED, ADDON_TREELINKED) or \
+                           iaddon.is_global
                     if self.mode == 'remove' and instance.addon_mode == 'manual':
                         self.warn("denied removal of %s `%s' from instance `%s' (%s)"
                                    " in addon-mode `%s'"