aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MERGE.txt7
-rwxr-xr-xsetuptools/command/easy_install.py3
2 files changed, 8 insertions, 2 deletions
diff --git a/MERGE.txt b/MERGE.txt
index bcff09da..ecb140da 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -28,3 +28,10 @@ Major Changes
<http://bugs.python.org/setuptools/issue33>`_ indicates that the feature
should remain and no substantial justification was given in the `Distribute
report <https://bitbucket.org/tarek/distribute/issue/19/>`_.
+
+Minor Changes
+-------------
+
+* The patch for `#174 <https://bitbucket.org/tarek/distribute/issue/174>`_
+ has been rolled-back, as the comment on the ticket indicates that the patch
+ addressed a symptom and not the fundamental issue.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4ca0526d..655478b3 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -655,8 +655,7 @@ Please make the appropriate changes for your system and try again.
self.update_pth(dist)
self.package_index.add(dist)
self.local_index.add(dist)
- if not self.editable:
- self.install_egg_scripts(dist)
+ self.install_egg_scripts(dist)
self.installed_projects[dist.key] = dist
log.info(self.installation_report(requirement, dist, *info))
if (dist.has_metadata('dependency_links.txt') and