aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MERGE.txt5
-rwxr-xr-xsetuptools/command/easy_install.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/MERGE.txt b/MERGE.txt
index e4cd20a0..bcff09da 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -23,3 +23,8 @@ Major Changes
-------------
* The _distribute property of the setuptools module has been removed.
+* Distributions are once again installed as zipped eggs by default, per the
+ rationale given in `the seminal bug report
+ <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/>`_.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 8d44817f..4ca0526d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -704,7 +704,7 @@ Please make the appropriate changes for your system and try again.
return True
if not dist.has_metadata('zip-safe'):
return True
- return True
+ return False
def maybe_move(self, spec, dist_filename, setup_base):
dst = os.path.join(self.build_directory, spec.key)