Package: zope-common
Version: 0.5.44
Severity: normal

svn diff -r 1255:1256 svn://svn.debian.org/pkg-zope/zope-common/trunk/dzhandle
Index: dzhandle
===================================================================
--- dzhandle    (revision 1255)
+++ dzhandle    (revision 1256)

@@ -2049,8 +2049,9 @@
         dzlib = os.path.join(addon.path, '.dzlib')
         if os.path.isdir(dzlib):
             for dir in os.listdir(dzlib):
-                os.symlink(os.path.join(dzlib, dir),
-                    os.path.join(self.home, 'lib', 'python', dir))
+                if not os.path.exists(os.path.join(dzlib, dir)):
+                    os.symlink(os.path.join(dzlib, dir),
+                        os.path.join(self.home, 'lib', 'python', dir))
 
         added_addon = addon.addonClass(target_path, False)
         self._installed_addons.append(added_addon)

I think that if os.listdir says that dir is in dzlib, it can be trusted to 
exist, so saying 'if not os.path.exists(os.path.join(dzlib, dir)):' will 
likely never match. My guess is that kobold wanted to say

  if not os.path.exists(os.path.join(self.home, 'lib', 'python', dir)):

Symmetric code would be useful in remove_addon too, in order to remove 
addons that failed to install.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.22quest (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=ISO-8859-1) (ignored: 
LC_ALL set to sv_SE)
Shell: /bin/sh linked to /bin/bash

Versions of packages zope-common depends on:
ii  adduser                       3.108      add and remove users and groups
ii  debconf [debconf-2.0]         1.5.23     Debian configuration management sy
ii  python2.4                     2.4.5-4    An interactive high-level object-o

zope-common recommends no packages.

zope-common suggests no packages.

-- debconf information:
  zope-common/admin-password-confirmation: (password omitted)
  zope-common/admin-password: (password omitted)
  zope-common/instance-http-port:
  zope-common/remove-instance-without-data: abort
  zope-common/admin-user: admin
  zope-common/instance-zeo-port:
  zope-common/admin-automatic-password:
  zope-common/keep-data-on-purge: true
  shared/zope/restart: end

-- 
"How can I tell that the road signed to hell - doesn't lead up to heaven?"
  -- Peter Hammill; The Comet, The Course, The Tail



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to