r856 - in zope-common/trunk: . debian

[bzed-guest at alioth.debian.org]

Author: bzed-guest
Date: 2007-05-14 09:04:35 +0000 (Mon, 14 May 2007)
New Revision: 856

Modified:
   zope-common/trunk/debian/changelog
   zope-common/trunk/dzhandle
Log:
      - fixing a bug which made dzhandle choke on manually installed,
        non-Debian products (Closes: #417745, #422875)



Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2007-05-13 15:06:18 UTC (rev 855)
+++ zope-common/trunk/debian/changelog	2007-05-14 09:04:35 UTC (rev 856)
@@ -5,8 +5,10 @@
         use dzhandle [..] make-instance --skelsrc=SKEL
       - adding a show-package-info option which prints the zope_packages
         dict in a reuseable way. Versions can be limited by using -z.
+      - fixing a bug which made dzhandle choke on manually installed,
+        non-Debian products (Closes: #417745, #422875)
 
- -- Bernd Zeimetz <bernd at bzed.de>  Sat, 05 May 2007 00:46:09 +0200
+ -- Bernd Zeimetz <bernd at bzed.de>  Mon, 14 May 2007 11:02:34 +0200
 
 zope-common (0.5.32) unstable; urgency=low
 

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2007-05-13 15:06:18 UTC (rev 855)
+++ zope-common/trunk/dzhandle	2007-05-14 09:04:35 UTC (rev 856)
@@ -1135,9 +1135,11 @@
     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.directory, self.instance.name, self.instance.version))
+                      % (self.kind, addon.name, self.instance.name, self.instance.version))
             except DZError, msg:
                 self.error(msg, go_on=True)