From ba813fa50adbaff2ecaa16015adcb22167e20e02 Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Wed, 9 Nov 2005 03:02:30 +0000 Subject: Normalize items in sys.path when determining where to insert a new item. --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041408 --- pkg_resources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg_resources.py') diff --git a/pkg_resources.py b/pkg_resources.py index 07b5675e..584e1bc6 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -1915,6 +1915,7 @@ class Distribution(object): self.check_version_conflict() best, pos = 0, -1 for p,item in enumerate(path): + item = normalize_path(item) if loc.startswith(item) and len(item)>best and loc<>item: best, pos = len(item), p if pos==-1: @@ -1924,7 +1925,6 @@ class Distribution(object): path.insert(pos,loc) - def check_version_conflict(self): if self.key=='setuptools': return # ignore the inevitable setuptools self-conflicts :( -- cgit v1.2.1