[Checkins] SVN: zc.buildout/branches/1.4/ Backport c120882 from trunk

Hanno Schlichting hannosch at hannosch.eu
Sat Mar 12 02:51:11 EST 2011


Log message for revision 120883:
  Backport c120882 from trunk
  

Changed:
  U   zc.buildout/branches/1.4/CHANGES.txt
  U   zc.buildout/branches/1.4/src/zc/buildout/easy_install.py

-=-
Modified: zc.buildout/branches/1.4/CHANGES.txt
===================================================================
--- zc.buildout/branches/1.4/CHANGES.txt	2011-03-12 07:46:06 UTC (rev 120882)
+++ zc.buildout/branches/1.4/CHANGES.txt	2011-03-12 07:51:11 UTC (rev 120883)
@@ -4,6 +4,8 @@
 1.4.5 (unreleased)
 ==================
 
+- Remove duplicate path from script's sys.path setup.
+
 Bugs fixed:
 
 - In the download module, fixed the handling of directories that are pointed

Modified: zc.buildout/branches/1.4/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/1.4/src/zc/buildout/easy_install.py	2011-03-12 07:46:06 UTC (rev 120882)
+++ zc.buildout/branches/1.4/src/zc/buildout/easy_install.py	2011-03-12 07:51:11 UTC (rev 120883)
@@ -915,7 +915,12 @@
 
     path = [dist.location for dist in working_set]
     path.extend(extra_paths)
-    path = map(realpath, path)
+    # order preserving unique
+    unique_path = []
+    for p in path:
+        if p not in unique_path:
+            unique_path.append(p)
+    path = map(realpath, unique_path)
 
     generated = []
 



More information about the checkins mailing list