r879 - in zope-common/branches/etch: . debian

[bzed-guest at alioth.debian.org]

Author: bzed-guest
Date: 2007-05-20 09:55:32 +0000 (Sun, 20 May 2007)
New Revision: 879

Modified:
   zope-common/branches/etch/debian/changelog
   zope-common/branches/etch/dzhandle
Log:
reverting not so important patch for dzhandle.
the security fix is still in and should go in r1


Modified: zope-common/branches/etch/debian/changelog
===================================================================
--- zope-common/branches/etch/debian/changelog	2007-05-16 23:13:40 UTC (rev 878)
+++ zope-common/branches/etch/debian/changelog	2007-05-20 09:55:32 UTC (rev 879)
@@ -1,13 +1,11 @@
 zope-common (0.5.31.etch1) UNRELEASED; urgency=low
 
-  * fixing a bug which made dzhandle choke on manually installed,
-    non-Debian products (Closes: #422875)
   * the bin directory of a new Zope instance should be owned by
     root:root as the scripts inside the directory are executed by
     root while starting/stopping the Zope instance. Thanks to
     Bastian Blank for reporting. (Closes: #388072)
 
- -- Bernd Zeimetz <bernd at bzed.de>  Thu, 17 May 2007 01:12:29 +0200
+ -- Bernd Zeimetz <bernd at bzed.de>  Sun, 20 May 2007 11:53:40 +0200
 
 zope-common (0.5.31) unstable; urgency=low
 

Modified: zope-common/branches/etch/dzhandle
===================================================================
--- zope-common/branches/etch/dzhandle	2007-05-16 23:13:40 UTC (rev 878)
+++ zope-common/branches/etch/dzhandle	2007-05-20 09:55:32 UTC (rev 879)
@@ -1134,11 +1134,9 @@
     def run(self, global_options):
         for addon, iaddon in self.addons:
             try:
-                if not addon:
-                    addon = iaddon
                 self.instance.remove_addon(addon, global_options)
                 self.info("removed %s `%s' from instance `%s' (%s)"
-                      % (self.kind, addon.name, self.instance.name, self.instance.version))
+                          % (self.kind, addon.directory, self.instance.name, self.instance.version))
             except DZError, msg:
                 self.error(msg, go_on=True)