[Checkins] SVN: zc.buildout/branches/gary-4/src/zc/buildout/easy_install.py merge from gary-3

[Gary Poster]

Log message for revision 109328:
  merge from gary-3

Changed:
  U   zc.buildout/branches/gary-4/src/zc/buildout/easy_install.py

-=-
Modified: zc.buildout/branches/gary-4/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/gary-4/src/zc/buildout/easy_install.py	2010-02-22 22:59:19 UTC (rev 109327)
+++ zc.buildout/branches/gary-4/src/zc/buildout/easy_install.py	2010-02-22 23:12:17 UTC (rev 109328)
@@ -60,12 +60,13 @@
     pkg_resources.Requirement.parse('setuptools')
     ).location
 
-# Include buildout and setuptools eggs in paths
-buildout_and_setuptools_path = [
-    setuptools_loc,
-    pkg_resources.working_set.find(
-        pkg_resources.Requirement.parse('zc.buildout')).location,
-    ]
+# Include buildout and setuptools eggs in paths.  We prevent dupes just to
+# keep from duplicating any log messages about them.
+buildout_loc = pkg_resources.working_set.find(
+    pkg_resources.Requirement.parse('zc.buildout')).location
+buildout_and_setuptools_path = [setuptools_loc]
+if os.path.normpath(setuptools_loc) != os.path.normpath(buildout_loc):
+    buildout_and_setuptools_path.append(buildout_loc)
 
 
 class IncompatibleVersionError(zc.buildout.UserError):