The list of eggs in generated scripts is sorted and duplicates removed. This...

The list of eggs in generated scripts is sorted and duplicates removed. This prevents problems in WingIDE and makes it easier for humans to look at and use the list of eggs.


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@82078 62d5b8a3-27da-0310-9561-8e5933582275

CHANGES.txt

@@ -14,6 +14,10 @@ Change History
 1.0.0b32 (2007-???)
 =====================
 
+- The list of eggs in generated scripts is sorted and duplicates
+  removed. This prevents problems in WingIDE and makes it easier for
+  humans to look at and use the list of eggs.
+
 1.0.0b31 (2007-11-01)
 =====================
 

src/zc/buildout/easy_install.py

@@ -849,6 +849,9 @@ def scripts(reqs, working_set, executable, dest,
     
     path = [dist.location for dist in working_set]
     path.extend(extra_paths)
+    # sort and remove duplicates
+    path = list(set(path))
+    path.sort()
     path = repr(path)[1:-1].replace(', ', ',\n  ')
     generated = []
 

src/zc/buildout/easy_install.txt

@@ -681,9 +681,9 @@ to be included in the a generated script:
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
+      '/foo/bar',
       '/sample-install/demo-0.3-py2.4.egg',
       '/sample-install/demoneeded-1.1-py2.4.egg',
-      '/foo/bar',
       ]
     <BLANKLINE>
     import eggrecipedemo

src/zc/buildout/update.txt

@@ -85,8 +85,8 @@ Our buildout script has been updated to use the new eggs:
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
-      '/sample-buildout/eggs/zc.buildout-99.99-py2.4.egg',
       '/sample-buildout/eggs/setuptools-99.99-py2.4.egg',
+      '/sample-buildout/eggs/zc.buildout-99.99-py2.4.egg',
       ]
     <BLANKLINE>
     import zc.buildout.buildout

zc.recipe.egg_/src/zc/recipe/egg/README.txt

@@ -358,9 +358,9 @@ Let's look at the script that was generated:
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
+      '/foo/bar',
       '/sample-buildout/eggs/demo-0.4c1-py2.4.egg',
       '/sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg',
-      '/foo/bar',
       '/spam/eggs',
       ]
     <BLANKLINE>
@@ -405,9 +405,9 @@ to be included in generated scripts:
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
+      '/foo/bar',
       '/sample-buildout/eggs/demo-0.4c1-py2.4.egg',
       '/sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg',
-      '/foo/bar',
       '/spam/eggs',
       ]
     <BLANKLINE>
@@ -463,9 +463,9 @@ declare entry points using the entry-points option:
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
+      '/foo/bar',
       '/sample-buildout/eggs/demo-0.4c1-py2.4.egg',
       '/sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg',
-      '/foo/bar',
       '/spam/eggs',
       ]
     <BLANKLINE>