From dcd1dd3857242fe3463d68cb19abfe431f520f92 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Thu, 11 Feb 2010 14:47:04 +0100 Subject: fix develop --user for having '.' in PYTHON_PATH the pth file update wouldn't work if the distribution location is in the side dirs so we special-case for the location being the cwd --HG-- branch : distribute extra : rebase_source : 4c80082825c25f7f4692fcdd3580da5d1948ef89 --- setuptools/command/easy_install.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'setuptools/command/easy_install.py') diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 421d0c09..4b42a537 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1420,8 +1420,12 @@ class PthDistributions(Environment): def add(self,dist): """Add `dist` to the distribution map""" - if dist.location not in self.paths and dist.location not in self.sitedirs: - self.paths.append(dist.location); self.dirty = True + if (dist.location not in self.paths and ( + dist.location not in self.sitedirs or + dist.location == os.getcwd() #account for '.' being in PYTHONPATH + )): + self.paths.append(dist.location) + self.dirty = True Environment.add(self,dist) def remove(self,dist): -- cgit v1.2.1