r440 - zope-common/trunk

[Fabio Tranchitella]

Author: kobold
Date: 2006-11-02 17:51:45 +0100 (Thu, 02 Nov 2006)
New Revision: 440

Modified:
   zope-common/trunk/dzhandle
Log:
Bug fixing.


Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2006-11-02 16:20:52 UTC (rev 439)
+++ zope-common/trunk/dzhandle	2006-11-02 16:51:45 UTC (rev 440)
@@ -893,7 +893,7 @@
                          default=False, action='store_true', dest='lazy')
             p.add_option('-t', '--installation-technique',
                          help="how to install addons (linked, tree-linked, copied)",
-                         default="tree-linked", action='store', dest='atechnique')
+                         default=None, action='store', dest='atechnique')
             self._option_parser = p
         return self._option_parser
 
@@ -931,7 +931,7 @@
             else:
                 match = self.find_addon(d)
 
-            if match not in (installed + depends):
+            if match and match not in (installed + depends):
                 depends.append(match)
                 depends += self.find_related(match.depends, installed + depends)
 
@@ -1841,7 +1841,7 @@
             os.unlink(installed.path)
         elif installed.type in (ADDON_MANUAL, ADDON_COPIED) and not global_options.force:
             raise DZError, "not removing copied or manually installed %s `%s'" \
-                  (installed.kind, installed.name)
+                  % (installed.kind, installed.name)
         elif installed.type in (ADDON_TREELINKED, ADDON_COPIED) and not global_options.force:
             if os.path.islink(installed.path):
                 os.unlink(installed.path)