[Checkins] SVN: zc.buildout/trunk/ 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.

[Florian Schulze]

Log message for revision 82078:
  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.
  

Changed:
  U   zc.buildout/trunk/CHANGES.txt
  U   zc.buildout/trunk/src/zc/buildout/easy_install.py
  U   zc.buildout/trunk/src/zc/buildout/easy_install.txt
  U   zc.buildout/trunk/src/zc/buildout/update.txt
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt

-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt	2007-12-02 11:34:17 UTC (rev 82077)
+++ zc.buildout/trunk/CHANGES.txt	2007-12-02 14:03:30 UTC (rev 82078)
@@ -14,6 +14,10 @@
 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)
 =====================
 

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py	2007-12-02 11:34:17 UTC (rev 82077)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py	2007-12-02 14:03:30 UTC (rev 82078)
@@ -849,6 +849,9 @@
     
     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 = []
 

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.txt	2007-12-02 11:34:17 UTC (rev 82077)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.txt	2007-12-02 14:03:30 UTC (rev 82078)
@@ -681,9 +681,9 @@
     <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

Modified: zc.buildout/trunk/src/zc/buildout/update.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/update.txt	2007-12-02 11:34:17 UTC (rev 82077)
+++ zc.buildout/trunk/src/zc/buildout/update.txt	2007-12-02 14:03:30 UTC (rev 82078)
@@ -85,8 +85,8 @@
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
+      '/sample-buildout/eggs/setuptools-99.99-py2.4.egg',
       '/sample-buildout/eggs/zc.buildout-99.99-py2.4.egg',
-      '/sample-buildout/eggs/setuptools-99.99-py2.4.egg',
       ]
     <BLANKLINE>
     import zc.buildout.buildout

Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2007-12-02 11:34:17 UTC (rev 82077)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2007-12-02 14:03:30 UTC (rev 82078)
@@ -358,9 +358,9 @@
     <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 @@
     <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 @@
     <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>