aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools.txt
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-09-06 18:14:34 +0000
committerPJ Eby <distutils-sig@python.org>2006-09-06 18:14:34 +0000
commit346215d9cf66fa98203fa4cb803f2d60f6798c07 (patch)
treec285951f07397f7c65649223b234328ddceaa71d /setuptools.txt
parentc63bb77e4ccbeee217aeafca3a8b0efc812f8d82 (diff)
downloadexternal_python_setuptools-346215d9cf66fa98203fa4cb803f2d60f6798c07.tar.gz
external_python_setuptools-346215d9cf66fa98203fa4cb803f2d60f6798c07.tar.bz2
external_python_setuptools-346215d9cf66fa98203fa4cb803f2d60f6798c07.zip
Support setuptools .egg being in current directory when bootstrapping on
an offline machine. Output what version/location is conflicting when a newer version of setuptools is requested. --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4051778
Diffstat (limited to 'setuptools.txt')
-rwxr-xr-xsetuptools.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/setuptools.txt b/setuptools.txt
index 7cfc3815..42e81d32 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -2563,6 +2563,11 @@ XXX
Release Notes/Change History
----------------------------
+0.6c2
+ * The ``ez_setup`` module displays the conflicting version of setuptools (and
+ its installation location) when a script requests a version that's not
+ available.
+
0.6c1
* Fixed ``AttributeError`` when trying to download a ``setup_requires``
dependency when a distribution lacks a ``dependency_links`` setting.